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

Commit 4e247614 authored by Jan Tulak's avatar Jan Tulak Committed by Dave Chinner
Browse files

xfs: prefix XATTR_LIST_MAX with XFS_ 



Remove a hard dependency of Linux XATTR_LIST_MAX value by using
a prefixed version. This patch reflects the same change in xfsprogs.

Signed-off-by: default avatarJan Tulak <jtulak@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent fef4ded8

fs/xfs/libxfs/xfs_fs.h

+10 −0
Original line number Diff line number Diff line
@@ -489,6 +489,16 @@ typedef struct xfs_swapext 
#define XFS_FSOP_GOING_FLAGS_LOGFLUSH		0x1	/* flush log but not data */

#define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH		0x2	/* don't flush log nor data */



/*

 * ioctl limits

 */

#ifdef XATTR_LIST_MAX

#  define XFS_XATTR_LIST_MAX XATTR_LIST_MAX

#else

#  define XFS_XATTR_LIST_MAX 65536

#endif





/*

 * ioctl commands that are used by Linux filesystems

 */

fs/xfs/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ xfs_attrlist_by_handle( 
	if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t)))

		return -EFAULT;

	if (al_hreq.buflen < sizeof(struct attrlist) ||

	    al_hreq.buflen > XATTR_LIST_MAX)

	    al_hreq.buflen > XFS_XATTR_LIST_MAX)

		return -EINVAL;



	/*

fs/xfs/xfs_ioctl32.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ xfs_compat_attrlist_by_handle( 
			   sizeof(compat_xfs_fsop_attrlist_handlereq_t)))

		return -EFAULT;

	if (al_hreq.buflen < sizeof(struct attrlist) ||

	    al_hreq.buflen > XATTR_LIST_MAX)

	    al_hreq.buflen > XFS_XATTR_LIST_MAX)

		return -EINVAL;



	/*