summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_bmap.c
diff options
context:
space:
mode:
authorChristoph Hellwig2013-03-12 13:30:36 +0100
committerBen Myers2013-03-14 22:19:14 +0100
commit56cea2d088811b8cf7d2893e29bcf369a912de69 (patch)
treeab131c69db53bb17879d9efada9534d17e54cc57 /fs/xfs/xfs_bmap.c
parentxfs: ensure we capture IO errors correctly (diff)
downloadkernel-qcow2-linux-56cea2d088811b8cf7d2893e29bcf369a912de69.tar.gz
kernel-qcow2-linux-56cea2d088811b8cf7d2893e29bcf369a912de69.tar.xz
kernel-qcow2-linux-56cea2d088811b8cf7d2893e29bcf369a912de69.zip
xfs: take inode version into account in XFS_LITINO
Add a version argument to XFS_LITINO so that it can return different values depending on the inode version. This is required for the upcoming v3 inodes with a larger fixed layout dinode. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Ben Myers <bpm@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
-rw-r--r--fs/xfs/xfs_bmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index d490fe8fd19f..20efb397a7f4 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -228,13 +228,13 @@ xfs_default_attroffset(
uint offset;
if (mp->m_sb.sb_inodesize == 256) {
- offset = XFS_LITINO(mp) -
+ offset = XFS_LITINO(mp, ip->i_d.di_version) -
XFS_BMDR_SPACE_CALC(MINABTPTRS);
} else {
offset = XFS_BMDR_SPACE_CALC(6 * MINABTPTRS);
}
- ASSERT(offset < XFS_LITINO(mp));
+ ASSERT(offset < XFS_LITINO(mp, ip->i_d.di_version));
return offset;
}