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

Commit cf257abf authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: xfs_attr_shortform_allfit() does not handle attr3 format. 



xfstests generic/117 fails with:

XFS: Assertion failed: leaf->hdr.info.magic == cpu_to_be16(XFS_ATTR_LEAF_MAGIC)

indicating a function that does not handle the attr3 format
correctly. Fix it.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
(cherry picked from commit b38958d7)
parent 7ced60ca

fs/xfs/xfs_attr_leaf.c

+13 −11
Original line number Diff line number Diff line
@@ -934,17 +934,19 @@ xfs_attr_shortform_allfit( 
	struct xfs_buf		*bp,

	struct xfs_inode	*dp)

{

	xfs_attr_leafblock_t *leaf;

	xfs_attr_leaf_entry_t *entry;

	struct xfs_attr_leafblock *leaf;

	struct xfs_attr_leaf_entry *entry;

	xfs_attr_leaf_name_local_t *name_loc;

	int bytes, i;

	struct xfs_attr3_icleaf_hdr leafhdr;

	int			bytes;

	int			i;



	leaf = bp->b_addr;

	ASSERT(leaf->hdr.info.magic == cpu_to_be16(XFS_ATTR_LEAF_MAGIC));

	xfs_attr3_leaf_hdr_from_disk(&leafhdr, leaf);

	entry = xfs_attr3_leaf_entryp(leaf);



	entry = &leaf->entries[0];

	bytes = sizeof(struct xfs_attr_sf_hdr);

	for (i = 0; i < be16_to_cpu(leaf->hdr.count); entry++, i++) {

	for (i = 0; i < leafhdr.count; entry++, i++) {

		if (entry->flags & XFS_ATTR_INCOMPLETE)

			continue;		/* don't copy partial entries */

		if (!(entry->flags & XFS_ATTR_LOCAL))
@@ -961,8 +963,8 @@ xfs_attr_shortform_allfit( 
	if ((dp->i_mount->m_flags & XFS_MOUNT_ATTR2) &&

	    (dp->i_d.di_format != XFS_DINODE_FMT_BTREE) &&

	    (bytes == sizeof(struct xfs_attr_sf_hdr)))

		return(-1);

	return(xfs_attr_shortform_bytesfit(dp, bytes));

		return -1;

	return xfs_attr_shortform_bytesfit(dp, bytes);

}



/*