From owner-svn-src-head@freebsd.org Sat May 19 19:30:43 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 312B7EE0F32; Sat, 19 May 2018 19:30:43 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA52C7C34F; Sat, 19 May 2018 19:30:42 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC850396B; Sat, 19 May 2018 19:30:42 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4JJUgiU095098; Sat, 19 May 2018 19:30:42 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JJUgMY094880; Sat, 19 May 2018 19:30:42 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805191930.w4JJUgMY094880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sat, 19 May 2018 19:30:42 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head/sys/ufs: ffs ufs X-SVN-Commit-Revision: 333888 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 19:30:43 -0000 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);