aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMandy Kirkconnell <alkirkco@sgi.com>2006-03-13 22:07:24 -0500
committerNathan Scott <nathans@sgi.com>2006-03-13 22:07:24 -0500
commitf020b67f3c0c071ed5b2281bfa717125c8a39ad6 (patch)
tree84cb03ab100ff95a7f02b671947bbbca3cfddad8 /fs
parenta50cd2692617cfb796140a62c0082bce0a7306c7 (diff)
[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')
-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 9f0ed4869d47..64a02eaf1dfe 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -3414,7 +3414,8 @@ xfs_bmap_local_to_extents(
3414 3414
3415 args.tp = tp; 3415 args.tp = tp;
3416 args.mp = ip->i_mount; 3416 args.mp = ip->i_mount;
3417 ASSERT(ifp->if_flags & XFS_IFINLINE); 3417 ASSERT((ifp->if_flags &
3418 (XFS_IFINLINE|XFS_IFEXTENTS|XFS_IFEXTIREC)) == XFS_IFINLINE);
3418 /* 3419 /*
3419 * Allocate a block. We know we need only one, since the 3420 * Allocate a block. We know we need only one, since the
3420 * file currently fits in an inode. 3421 * file currently fits in an inode.
@@ -3445,7 +3446,6 @@ xfs_bmap_local_to_extents(
3445 xfs_bmap_forkoff_reset(args.mp, ip, whichfork); 3446 xfs_bmap_forkoff_reset(args.mp, ip, whichfork);
3446 xfs_idata_realloc(ip, -ifp->if_bytes, whichfork); 3447 xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
3447 xfs_iext_add(ifp, 0, 1); 3448 xfs_iext_add(ifp, 0, 1);
3448 ASSERT((ifp->if_flags & (XFS_IFEXTENTS|XFS_IFEXTIREC)) == XFS_IFEXTENTS);
3449 ep = xfs_iext_get_ext(ifp, 0); 3449 ep = xfs_iext_get_ext(ifp, 0);
3450 xfs_bmbt_set_allf(ep, 0, args.fsbno, 1, XFS_EXT_NORM); 3450 xfs_bmbt_set_allf(ep, 0, args.fsbno, 1, XFS_EXT_NORM);
3451 xfs_bmap_trace_post_update(fname, "new", ip, 0, whichfork); 3451 xfs_bmap_trace_post_update(fname, "new", ip, 0, whichfork);