Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c167b77d authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Tim Shimmin
Browse files

[XFS] Fix assertion in xfs_attr_shortform_remove(). 



SGI-PV: 960791
SGI-Modid: xfs-linux-melb:xfs-kern:28021a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarBarry Naujok <bnaujok@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 68160161

fs/xfs/xfs_attr_leaf.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -392,7 +392,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) 
		dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);

		dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);

		ASSERT(dp->i_d.di_forkoff);

		ASSERT(dp->i_d.di_forkoff);

		ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || args->addname ||

		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 =

		dp->i_afp->if_ext_max =

			XFS_IFORK_ASIZE(dp) / (uint)sizeof(xfs_bmbt_rec_t);

			XFS_IFORK_ASIZE(dp) / (uint)sizeof(xfs_bmbt_rec_t);

		dp->i_df.if_ext_max =

		dp->i_df.if_ext_max =