From owner-svn-src-all@FreeBSD.ORG Fri Aug 17 17:45:28 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C685106566B; Fri, 17 Aug 2012 17:45:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 263C08FC0A; Fri, 17 Aug 2012 17:45:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7HHjS1K002361; Fri, 17 Aug 2012 17:45:28 GMT (envelope-from mjg@svn.freebsd.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7HHjRHC002354; Fri, 17 Aug 2012 17:45:27 GMT (envelope-from mjg@svn.freebsd.org) Message-Id: <201208171745.q7HHjRHC002354@svn.freebsd.org> From: Mateusz Guzik Date: Fri, 17 Aug 2012 17:45:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239359 - in head: sys/fs/ext2fs sys/ufs/ufs usr.sbin/makefs/ffs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 17:45:28 -0000 Author: mjg Date: Fri Aug 17 17:45:27 2012 New Revision: 239359 URL: http://svn.freebsd.org/changeset/base/239359 Log: Remove unused member of struct indir (in_exists) from UFS and EXT2 code. Reviewed by: mckusick Approved by: trasz (mentor) MFC after: 1 week Modified: head/sys/fs/ext2fs/ext2_bmap.c head/sys/fs/ext2fs/inode.h head/sys/ufs/ufs/inode.h head/sys/ufs/ufs/ufs_bmap.c head/usr.sbin/makefs/ffs/ffs_extern.h head/usr.sbin/makefs/ffs/ufs_bmap.c Modified: head/sys/fs/ext2fs/ext2_bmap.c ============================================================================== --- head/sys/fs/ext2fs/ext2_bmap.c Fri Aug 17 16:27:11 2012 (r239358) +++ head/sys/fs/ext2fs/ext2_bmap.c Fri Aug 17 17:45:27 2012 (r239359) @@ -183,7 +183,6 @@ ext2_bmaparray(vp, bn, bnp, runp, runb) if (bp) bqrelse(bp); - ap->in_exists = 1; bp = getblk(vp, metalbn, bsize, 0, 0, 0); if ((bp->b_flags & B_CACHE) == 0) { #ifdef DIAGNOSTIC @@ -310,7 +309,6 @@ ext2_getlbns(vp, bn, ap, nump) */ ap->in_lbn = metalbn; ap->in_off = off = NIADDR - i; - ap->in_exists = 0; ap++; for (++numlevels; i <= NIADDR; i++) { /* If searching for a meta-data block, quit when found. */ @@ -322,7 +320,6 @@ ext2_getlbns(vp, bn, ap, nump) ++numlevels; ap->in_lbn = metalbn; ap->in_off = off; - ap->in_exists = 0; ++ap; metalbn -= -1 + off * blockcnt; Modified: head/sys/fs/ext2fs/inode.h ============================================================================== --- head/sys/fs/ext2fs/inode.h Fri Aug 17 16:27:11 2012 (r239358) +++ head/sys/fs/ext2fs/inode.h Fri Aug 17 17:45:27 2012 (r239359) @@ -151,7 +151,6 @@ struct inode { struct indir { int32_t in_lbn; /* Logical block number. */ int in_off; /* Offset in buffer. */ - int in_exists; /* Flag if the block exists. */ }; /* Convert between inode pointers and vnode pointers. */ Modified: head/sys/ufs/ufs/inode.h ============================================================================== --- head/sys/ufs/ufs/inode.h Fri Aug 17 16:27:11 2012 (r239358) +++ head/sys/ufs/ufs/inode.h Fri Aug 17 17:45:27 2012 (r239359) @@ -167,7 +167,6 @@ struct inode { struct indir { ufs2_daddr_t in_lbn; /* Logical block number. */ int in_off; /* Offset in buffer. */ - int in_exists; /* Flag if the block exists. */ }; /* Convert between inode pointers and vnode pointers. */ Modified: head/sys/ufs/ufs/ufs_bmap.c ============================================================================== --- head/sys/ufs/ufs/ufs_bmap.c Fri Aug 17 16:27:11 2012 (r239358) +++ head/sys/ufs/ufs/ufs_bmap.c Fri Aug 17 17:45:27 2012 (r239359) @@ -212,7 +212,6 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, ru if (bp) bqrelse(bp); - ap->in_exists = 1; bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0, 0); if ((bp->b_flags & B_CACHE) == 0) { #ifdef INVARIANTS @@ -357,7 +356,6 @@ ufs_getlbns(vp, bn, ap, nump) */ ap->in_lbn = metalbn; ap->in_off = off = NIADDR - i; - ap->in_exists = 0; ap++; for (++numlevels; i <= NIADDR; i++) { /* If searching for a meta-data block, quit when found. */ @@ -370,7 +368,6 @@ ufs_getlbns(vp, bn, ap, nump) ++numlevels; ap->in_lbn = metalbn; ap->in_off = off; - ap->in_exists = 0; ++ap; metalbn -= -1 + off * blockcnt; Modified: head/usr.sbin/makefs/ffs/ffs_extern.h ============================================================================== --- head/usr.sbin/makefs/ffs/ffs_extern.h Fri Aug 17 16:27:11 2012 (r239358) +++ head/usr.sbin/makefs/ffs/ffs_extern.h Fri Aug 17 17:45:27 2012 (r239359) @@ -44,7 +44,6 @@ struct inode; struct indir { daddr_t in_lbn; /* Logical block number. */ int in_off; /* Offset in buffer. */ - int in_exists; /* Flag if the block exists. */ }; /* ffs.c */ Modified: head/usr.sbin/makefs/ffs/ufs_bmap.c ============================================================================== --- head/usr.sbin/makefs/ffs/ufs_bmap.c Fri Aug 17 16:27:11 2012 (r239358) +++ head/usr.sbin/makefs/ffs/ufs_bmap.c Fri Aug 17 17:45:27 2012 (r239359) @@ -117,7 +117,6 @@ ufs_getlbns(struct inode *ip, daddr_t bn */ ap->in_lbn = metalbn; ap->in_off = off = NIADDR - i; - ap->in_exists = 0; ap++; for (++numlevels; i <= NIADDR; i++) { /* If searching for a meta-data block, quit when found. */ @@ -131,7 +130,6 @@ ufs_getlbns(struct inode *ip, daddr_t bn ++numlevels; ap->in_lbn = metalbn; ap->in_off = off; - ap->in_exists = 0; ++ap; metalbn -= -1 + (off << lbc);