xfs
[Top] [All Lists]

[PATCH 1/2] xfs: prefix XATTR_LIST_MAX with XFS_

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/2] xfs: prefix XATTR_LIST_MAX with XFS_
From: Jan Tulak <jtulak@xxxxxxxxxx>
Date: Wed, 7 Oct 2015 13:10:36 +0200
Cc: Jan Tulak <jtulak@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1444216071-6281-1-git-send-email-jtulak@xxxxxxxxxx>
References: <1444216071-6281-1-git-send-email-jtulak@xxxxxxxxxx>
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@xxxxxxxxxx>
---
 fs/xfs/libxfs/xfs_fs.h | 10 ++++++++++
 fs/xfs/xfs_ioctl.c     |  2 +-
 fs/xfs/xfs_ioctl32.c   |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
index 89689c6..b2b73a9 100644
--- a/fs/xfs/libxfs/xfs_fs.h
+++ b/fs/xfs/libxfs/xfs_fs.h
@@ -490,6 +490,16 @@ typedef struct xfs_swapext
 #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
  */
 #define XFS_IOC_GETXFLAGS      FS_IOC_GETFLAGS
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index ea7d85a..0e692a6 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -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;
 
        /*
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index b88bdc8..1a05d8a 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -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;
 
        /*
-- 
2.4.3

<Prev in Thread] Current Thread [Next in Thread>