[PATCH v1 11/13] NFS: Move NFSACL_MAXPAGES into fs/nfs/nfs3_fs.h

[Chuck Lever <cel@kernel.org>]

Only the NFSv3 client's ACL code reads NFSACL_MAXPAGES, yet the macro
lives in <linux/nfsacl.h>, where it is the last reference to
NFS_ACL_MAX_ENTRIES. <linux/nfsacl.h> no longer includes
<uapi/linux/nfsacl.h>, so a file that includes only the kernel header
cannot expand NFSACL_MAXPAGES. Move the macro next to its users and
include nfs3_fs.h from nfs3xdr.c.

Signed-off-by: Chuck Lever <cel@kernel.org>
---
 fs/nfs/nfs3_fs.h       | 3 +++
 fs/nfs/nfs3xdr.c       | 1 +
 include/linux/nfsacl.h | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/nfs3_fs.h b/fs/nfs/nfs3_fs.h
index ffcabadb3546..09663adae033 100644
--- a/fs/nfs/nfs3_fs.h
+++ b/fs/nfs/nfs3_fs.h
@@ -11,6 +11,9 @@
  * nfs3acl.c
  */
 #ifdef CONFIG_NFS_V3_ACL
+#define NFSACL_MAXPAGES		((2*(8+12*NFS_ACL_MAX_ENTRIES) + PAGE_SIZE-1) \
+				 >> PAGE_SHIFT)
+
 extern struct posix_acl *nfs3_get_acl(struct inode *inode, int type, bool rcu);
 extern int nfs3_set_acl(const struct mnt_idmap *idmap, struct dentry *dentry,
 			struct posix_acl *acl, int type);
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index 3251c1434e71..19ab2fe84b8c 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -25,6 +25,7 @@
 #include <linux/nfs_common.h>
 
 #include "internal.h"
+#include "nfs3_fs.h"
 #include "nfstrace.h"
 
 #define NFSDBG_FACILITY		NFSDBG_XDR
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index 403f5f5144e3..5160f30151e8 100644
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
@@ -10,9 +10,6 @@
 #include <linux/posix_acl.h>
 #include <linux/sunrpc/xdr.h>
 
-#define NFSACL_MAXPAGES		((2*(8+12*NFS_ACL_MAX_ENTRIES) + PAGE_SIZE-1) \
-				 >> PAGE_SHIFT)
-
 #define NFS_ACL_MAX_ENTRIES_INLINE	(5)
 #define NFS_ACL_INLINE_BUFSIZE	((2*(2+3*NFS_ACL_MAX_ENTRIES_INLINE)) << 2)
 
-- 
2.56.0