diff options
author | kib <kib@FreeBSD.org> | 2016-10-01 09:19:43 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2016-10-01 09:19:43 +0000 |
commit | c83481c3142b3f842f75e35f0359ab1e4a918a1c (patch) | |
tree | 65d15e03e0d26f9bad6be5514272c0efe1e8e4cf /sys/ufs/ffs/ffs_balloc.c | |
parent | 5513c4602acb9d1e5d22c58e867ae3714c2ee127 (diff) | |
download | FreeBSD-src-c83481c3142b3f842f75e35f0359ab1e4a918a1c.zip FreeBSD-src-c83481c3142b3f842f75e35f0359ab1e4a918a1c.tar.gz |
MFC r305902:
Reduce size of ufs inode.
MFC r305903:
Fix libprocstat build after r305902.
Diffstat (limited to 'sys/ufs/ffs/ffs_balloc.c')
-rw-r--r-- | sys/ufs/ffs/ffs_balloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index 04e0ae9..64211d9 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -111,8 +111,8 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, int size, ip = VTOI(vp); dp = ip->i_din1; - fs = ip->i_fs; - ump = ip->i_ump; + fs = ITOFS(ip); + ump = ITOUMP(ip); lbn = lblkno(fs, startoffset); size = blkoff(fs, startoffset) + size; reclaimed = 0; @@ -548,7 +548,7 @@ fail: } lbns_remfree++; #endif - ffs_blkfree(ump, fs, ip->i_devvp, *blkp, fs->fs_bsize, + ffs_blkfree(ump, fs, ump->um_devvp, *blkp, fs->fs_bsize, ip->i_number, vp->v_type, NULL); } return (error); @@ -584,8 +584,8 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, ip = VTOI(vp); dp = ip->i_din2; - fs = ip->i_fs; - ump = ip->i_ump; + fs = ITOFS(ip); + ump = ITOUMP(ip); lbn = lblkno(fs, startoffset); size = blkoff(fs, startoffset) + size; reclaimed = 0; @@ -1143,7 +1143,7 @@ fail: } lbns_remfree++; #endif - ffs_blkfree(ump, fs, ip->i_devvp, *blkp, fs->fs_bsize, + ffs_blkfree(ump, fs, ump->um_devvp, *blkp, fs->fs_bsize, ip->i_number, vp->v_type, NULL); } return (error); |