From owner-p4-projects@FreeBSD.ORG Thu Nov 5 15:17:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E79031065679; Thu, 5 Nov 2009 15:17:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A405E1065670 for ; Thu, 5 Nov 2009 15:17:14 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77CA28FC0A for ; Thu, 5 Nov 2009 15:17:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA5FHEtZ035519 for ; Thu, 5 Nov 2009 15:17:14 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA5FHEJn035517 for perforce@freebsd.org; Thu, 5 Nov 2009 15:17:14 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 5 Nov 2009 15:17:14 GMT Message-Id: <200911051517.nA5FHEJn035517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2009 15:17:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=170226 Change 170226 by truncs@aditya on 2009/11/05 15:17:12 Build fixes. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#16 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#8 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#9 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#5 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#16 (text+ko) ==== @@ -736,7 +736,7 @@ if (ipref == -1) ipref = 0; fs = ip->i_e2fs; - ump = ip_i_ump; + ump = ip->i_ump; if (fs->e2fs_gd[cg].ext2bgd_nifree == 0) return (0); EXT2_UNLOCK(ump); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include #include - +#include /* * Balloc defines the structure of file system storage * by allocating the physical blocks on a device given @@ -135,7 +135,7 @@ nsize = fragroundup(fs, size); else nsize = fs->e2fs_bsize; - EXT2_LOCK(ump); + EXT2_LOCK(ump); error = ext2_alloc(ip, lbn, ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0), nsize, cred, &newb); @@ -180,7 +180,7 @@ after i_db[11], but it's not utterly clear whether this also applies to i_ib[1] and i_ib[0] */ - + EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); @@ -232,7 +232,7 @@ */ pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, bp->b_lblkno); -#else +#else EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); #endif ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#9 (text+ko) ==== @@ -876,6 +876,7 @@ vp->v_data = ip; ip->i_vnode = vp; ip->i_e2fs = fs = ump->um_e2fs; + ip->i_ump = ump; ip->i_number = ino; lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#5 (text+ko) ==== @@ -63,6 +63,7 @@ struct inode { struct vnode *i_vnode;/* Vnode associated with this inode. */ struct vnode *i_devvp;/* Vnode for block I/O. */ + struct ext2mount *i_ump; u_int32_t i_flag; /* flags, see below */ ino_t i_number; /* The identity of the inode. */ @@ -140,7 +141,8 @@ #define IN_HASHED 0x0020 /* Inode is on hash list */ #define IN_LAZYMOD 0x0040 /* Modified, but don't write yet. */ #define IN_SPACECOUNTED 0x0080 /* Blocks to be freed in free count. */ - +#define IN_LAZYACCESS 0x0100 /* Process IN_ACCESS after the + suspension finished */ #ifdef _KERNEL /* * Structure used to pass around logical block paths generated by