Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 19 May 2018 19:30:42 +0000 (UTC)
From:      Matt Macy <mmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r333888 - in head/sys/ufs: ffs ufs
Message-ID:  <201805191930.w4JJUgMY094880@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mmacy
Date: Sat May 19 19:30:42 2018
New Revision: 333888
URL: https://svnweb.freebsd.org/changeset/base/333888

Log:
  ufs: remove cgbno variable where unused

Modified:
  head/sys/ufs/ffs/ffs_alloc.c
  head/sys/ufs/ufs/ufs_gjournal.c

Modified: head/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- head/sys/ufs/ffs/ffs_alloc.c	Sat May 19 19:09:41 2018	(r333887)
+++ head/sys/ufs/ffs/ffs_alloc.c	Sat May 19 19:30:42 2018	(r333888)
@@ -2438,7 +2438,6 @@ ffs_freefile(ump, fs, devvp, ino, mode, wkhd)
 {
 	struct cg *cgp;
 	struct buf *bp;
-	ufs2_daddr_t cgbno;
 	int error;
 	u_int cg;
 	u_int8_t *inosused;
@@ -2449,11 +2448,9 @@ ffs_freefile(ump, fs, devvp, ino, mode, wkhd)
 		/* devvp is a snapshot */
 		MPASS(devvp->v_mount->mnt_data == ump);
 		dev = ump->um_devvp->v_rdev;
-		cgbno = fragstoblks(fs, cgtod(fs, cg));
 	} else if (devvp->v_type == VCHR) {
 		/* devvp is a normal disk device */
 		dev = devvp->v_rdev;
-		cgbno = fsbtodb(fs, cgtod(fs, cg));
 	} else {
 		bp = NULL;
 		return (0);
@@ -2505,21 +2502,13 @@ ffs_checkfreefile(fs, devvp, ino)
 {
 	struct cg *cgp;
 	struct buf *bp;
-	ufs2_daddr_t cgbno;
 	int ret, error;
 	u_int cg;
 	u_int8_t *inosused;
 
 	cg = ino_to_cg(fs, ino);
-	if (devvp->v_type == VREG) {
-		/* devvp is a snapshot */
-		cgbno = fragstoblks(fs, cgtod(fs, cg));
-	} else if (devvp->v_type == VCHR) {
-		/* devvp is a normal disk device */
-		cgbno = fsbtodb(fs, cgtod(fs, cg));
-	} else {
+	if ((devvp->v_type != VREG) && (devvp->v_type != VCHR))
 		return (1);
-	}
 	if (ino >= fs->fs_ipg * fs->fs_ncg)
 		return (1);
 	if ((error = ffs_getcg(fs, devvp, cg, &bp, &cgp)) != 0)

Modified: head/sys/ufs/ufs/ufs_gjournal.c
==============================================================================
--- head/sys/ufs/ufs/ufs_gjournal.c	Sat May 19 19:09:41 2018	(r333887)
+++ head/sys/ufs/ufs/ufs_gjournal.c	Sat May 19 19:30:42 2018	(r333888)
@@ -57,7 +57,6 @@ ufs_gjournal_modref(struct vnode *vp, int count)
 {
 	struct cg *cgp;
 	struct buf *bp;
-	ufs2_daddr_t cgbno;
 	int error, cg;
 	struct cdev *dev;
 	struct inode *ip;
@@ -76,11 +75,9 @@ ufs_gjournal_modref(struct vnode *vp, int count)
 	if (devvp->v_type == VREG) {
 		/* devvp is a snapshot */
 		dev = VFSTOUFS(devvp->v_mount)->um_devvp->v_rdev;
-		cgbno = fragstoblks(fs, cgtod(fs, cg));
 	} else if (devvp->v_type == VCHR) {
 		/* devvp is a normal disk device */
 		dev = devvp->v_rdev;
-		cgbno = fsbtodb(fs, cgtod(fs, cg));
 	} else {
 		bp = NULL;
 		return (EIO);

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