Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Oct 2021 18:30:23 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2bd6d910b243 - main - msdosfs_rename: remove write-only variables
Message-ID:  <202110201830.19KIUNLT070554@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=2bd6d910b24343f7678be7482a78fd7d596e6753

commit 2bd6d910b24343f7678be7482a78fd7d596e6753
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-10-20 01:55:50 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-10-20 18:29:49 +0000

    msdosfs_rename: remove write-only variables
    
    Reviewed by:    imp, mjg
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D32577
---
 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 44026c270f1c..a431190d7089 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110201830.19KIUNLT070554>