Date: Thu, 5 Nov 2009 15:17:14 GMT From: Aditya Sarawgi <truncs@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 170226 for review Message-ID: <200911051517.nA5FHEJn035517@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <fs/ext2fs/ext2fs.h> #include <fs/ext2fs/fs.h> #include <fs/ext2fs/ext2_extern.h> - +#include <fs/ext2fs/ext2_mount.h> /* * 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911051517.nA5FHEJn035517>