leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: prefix XATTR_LIST_MAX with XFS_

Browse Source 
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: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Jan Tulak 2015-10-12 16:02:56 +11:00 committed by Dave Chinner
parent fef4ded8cb
commit 4e247614a9
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/libxfs/xfs_fs.h
View File

@ -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_LOGFLUSH 0x1 /* flush log but not data */
#define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH 0x2 /* don't flush log nor 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 * ioctl commands that are used by Linux filesystems
*/ */

2
fs/xfs/xfs_ioctl.c
View File

@ -411,7 +411,7 @@ xfs_attrlist_by_handle(
if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t))) if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t)))
return -EFAULT; return -EFAULT;
if (al_hreq.buflen < sizeof(struct attrlist) || if (al_hreq.buflen < sizeof(struct attrlist) ||
al_hreq.buflen > XATTR_LIST_MAX) al_hreq.buflen > XFS_XATTR_LIST_MAX)
return -EINVAL; return -EINVAL;
/* /*

2
fs/xfs/xfs_ioctl32.c
View File

@ -356,7 +356,7 @@ xfs_compat_attrlist_by_handle(
sizeof(compat_xfs_fsop_attrlist_handlereq_t))) sizeof(compat_xfs_fsop_attrlist_handlereq_t)))
return -EFAULT; return -EFAULT;
if (al_hreq.buflen < sizeof(struct attrlist) || if (al_hreq.buflen < sizeof(struct attrlist) ||
al_hreq.buflen > XATTR_LIST_MAX) al_hreq.buflen > XFS_XATTR_LIST_MAX)
return -EINVAL; return -EINVAL;
/* /*