diff options
| author | Lachlan McIlroy <lachlan@sgi.com> | 2007-02-10 18:36:53 +1100 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2007-02-10 18:36:53 +1100 |
| commit | c167b77d5e172a2deb058be442ca652ad3a417f9 (patch) | |
| tree | 0e7d6d58634c4787283b90862140e552f3f6d742 /fs | |
| parent | 681601613759accffd8e8ddbc6f942eba7ecbfe5 (diff) | |
| download | linux-3.10-c167b77d5e172a2deb058be442ca652ad3a417f9.tar.gz linux-3.10-c167b77d5e172a2deb058be442ca652ad3a417f9.tar.bz2 linux-3.10-c167b77d5e172a2deb058be442ca652ad3a417f9.zip | |
[XFS] Fix assertion in xfs_attr_shortform_remove().
SGI-PV: 960791
SGI-Modid: xfs-linux-melb:xfs-kern:28021a
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_attr_leaf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index e4664136843..8eab73e8340 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c @@ -392,7 +392,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); ASSERT(dp->i_d.di_forkoff); ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || args->addname || - !(mp->m_flags & XFS_MOUNT_ATTR2)); + !(mp->m_flags & XFS_MOUNT_ATTR2) || + dp->i_d.di_format == XFS_DINODE_FMT_BTREE); dp->i_afp->if_ext_max = XFS_IFORK_ASIZE(dp) / (uint)sizeof(xfs_bmbt_rec_t); dp->i_df.if_ext_max = |