From nobody Wed Oct 27 00:45:16 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8DEEB18183E2; Wed, 27 Oct 2021 00:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hf92h2npsz3kf4; Wed, 27 Oct 2021 00:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40430266E1; Wed, 27 Oct 2021 00:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R0jGJH011138; Wed, 27 Oct 2021 00:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R0jGaP011137; Wed, 27 Oct 2021 00:45:16 GMT (envelope-from git) Date: Wed, 27 Oct 2021 00:45:16 GMT Message-Id: <202110270045.19R0jGaP011137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3d7f945a6b77 - stable/13 - msdosfs_rename: remove write-only variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d7f945a6b770d466e605b7346f9a90da6a2c85d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d7f945a6b770d466e605b7346f9a90da6a2c85d commit 3d7f945a6b770d466e605b7346f9a90da6a2c85d Author: Konstantin Belousov AuthorDate: 2021-10-20 01:55:50 +0000 Commit: Konstantin Belousov CommitDate: 2021-10-27 00:24:40 +0000 msdosfs_rename: remove write-only variables (cherry picked from commit 2bd6d910b24343f7678be7482a78fd7d596e6753) --- sys/fs/msdosfs/msdosfs_vnops.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index dda45ddda2a4..d64dcf4266bb 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -941,14 +941,12 @@ msdosfs_rename(struct vop_rename_args *ap) struct componentname *fcnp, *tcnp; struct denode *fdip, *fip, *tdip, *tip, *nip; u_char toname[12], oldname[11]; - u_long from_diroffset, to_diroffset; + u_long to_diroffset; bool checkpath_locked, doingdirectory, newparent; - u_char to_count; int error; u_long cn, pcl, blkoff; daddr_t bn, wait_scn, scn; struct msdosfsmount *pmp; - struct mount *mp; struct direntry *dotdotp; struct buf *bp; @@ -968,7 +966,6 @@ msdosfs_rename(struct vop_rename_args *ap) /* * Check for cross-device rename. */ - mp = fvp->v_mount; if (fvp->v_mount != tdvp->v_mount || (tvp != NULL && fvp->v_mount != tvp->v_mount)) { error = EXDEV; @@ -1031,7 +1028,6 @@ relock: } vrele(fvp); fvp = DETOV(nip); - from_diroffset = fdip->de_fndoffset; error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); if (error != 0 && error != EJUSTRETURN) { @@ -1077,7 +1073,6 @@ relock: * Remember direntry place to use for destination */ to_diroffset = tdip->de_fndoffset; - to_count = tdip->de_fndcnt; /* * Be sure we are not renaming ".", "..", or an alias of ".". This