d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 118969 from UFS:

Browse Source 
Eliminate the i_devvp field from the incore inodes, we can get the same
value from ip->i_ump->um_devvp.

Submitted by:	Pedro F. Giffuni  giffunip at yahoo
MFC after:	1 week
This commit is contained in:
John Baldwin 2011-01-19 16:46:13 +00:00
parent 18a22f96e0
commit 007c620744
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/ext2fs/ext2_subr.c
View File

@ -105,7 +105,7 @@ ext2_checkoverlap(bp, ip)
for (ep = buf; ep < ebp; ep++) {
if (ep == bp || (ep->b_flags & B_INVAL))
continue;
vp = ip->i_devvp;
vp = ip->i_ump->um_devvp;
/* look for overlap */
if (ep->b_bcount == 0 || ep->b_blkno > last ||
ep->b_blkno + btodb(ep->b_bcount) <= start)

3
sys/fs/ext2fs/ext2_vfsops.c
View File

@ -945,9 +945,8 @@ ext2_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
}
/*
* Finish inode initialization now that aliasing has been resolved.
* Finish inode initialization.
*/
ip->i_devvp = ump->um_devvp;
/*
* Set up a generation number for this inode if it does not

4
sys/fs/ext2fs/inode.h
View File

@ -62,7 +62,6 @@
*/
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. */
@ -143,6 +142,9 @@ struct inode {
#define IN_SPACECOUNTED 0x0080 /* Blocks to be freed in free count. */
#define IN_LAZYACCESS 0x0100 /* Process IN_ACCESS after the
suspension finished */
#define i_devvp i_ump->um_devvp
#ifdef _KERNEL
/*
* Structure used to pass around logical block paths generated by