aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_bmap.c
diff options
context:
space:
mode:
authorMandy Kirkconnell <alkirkco@sgi.com>2006-03-14 14:07:24 +1100
committerNathan Scott <nathans@sgi.com>2006-03-14 14:07:24 +1100
commitf020b67f3c0c071ed5b2281bfa717125c8a39ad6 (patch)
tree84cb03ab100ff95a7f02b671947bbbca3cfddad8 /fs/xfs/xfs_bmap.c
parenta50cd2692617cfb796140a62c0082bce0a7306c7 (diff)
downloadkernel_samsung_tuna-f020b67f3c0c071ed5b2281bfa717125c8a39ad6.zip
kernel_samsung_tuna-f020b67f3c0c071ed5b2281bfa717125c8a39ad6.tar.gz
kernel_samsung_tuna-f020b67f3c0c071ed5b2281bfa717125c8a39ad6.tar.bz2
[XFS] Fix assert to check that in-core extents are inline only.
SGI-PV: 950678 SGI-Modid: xfs-linux-melb:xfs-kern:207634a Signed-off-by: Mandy Kirkconnell <alkirkco@sgi.com> Signed-off-by: Nathan Scott <nathans@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 9f0ed48..64a02ea 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -3414,7 +3414,8 @@ xfs_bmap_local_to_extents(
args.tp = tp;
args.mp = ip->i_mount;
- ASSERT(ifp->if_flags & XFS_IFINLINE);
+ ASSERT((ifp->if_flags &
+ (XFS_IFINLINE|XFS_IFEXTENTS|XFS_IFEXTIREC)) == XFS_IFINLINE);
/*
* Allocate a block. We know we need only one, since the
* file currently fits in an inode.
@@ -3445,7 +3446,6 @@ xfs_bmap_local_to_extents(
xfs_bmap_forkoff_reset(args.mp, ip, whichfork);
xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
xfs_iext_add(ifp, 0, 1);
- ASSERT((ifp->if_flags & (XFS_IFEXTENTS|XFS_IFEXTIREC)) == XFS_IFEXTENTS);
ep = xfs_iext_get_ext(ifp, 0);
xfs_bmbt_set_allf(ep, 0, args.fsbno, 1, XFS_EXT_NORM);
xfs_bmap_trace_post_update(fname, "new", ip, 0, whichfork);