1 files changed, 24 insertions, 0 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 178e27494b74..d44b04d9b0a9 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1353,6 +1353,7 @@ config NFSD
         select LOCKD
         select SUNRPC
         select EXPORTFS
+        select NFS_ACL_SUPPORT if NFSD_V3_ACL || NFSD_V2_ACL
         help
           If you want your Linux box to act as an NFS *server*, so that other
           computers on your local network which support NFS can access certain
@@ -1376,6 +1377,10 @@ config NFSD
           To compile the NFS server support as a module, choose M here: the
           module will be called nfsd.  If unsure, say N.
 
+config NFSD_V2_ACL
+        bool
+        depends on NFSD
+
 config NFSD_V3
         bool "Provide NFSv3 server support"
         depends on NFSD
@@ -1383,6 +1388,16 @@ config NFSD_V3
           If you would like to include the NFSv3 server as well as the NFSv2
           server, say Y here.  If unsure, say Y.
 
+config NFSD_V3_ACL
+        bool "Provide server support for the NFSv3 ACL protocol extension"
+        depends on NFSD_V3
+        select NFSD_V2_ACL
+        help
+          Implement the NFSv3 ACL protocol extension for manipulating POSIX
+          Access Control Lists on exported file systems. NFS clients should
+          be compiled with the NFSv3 ACL protocol extension; see the
+          CONFIG_NFS_V3_ACL option.  If unsure, say N.
+
 config NFSD_V4
         bool "Provide NFSv4 server support (EXPERIMENTAL)"
         depends on NFSD_V3 && EXPERIMENTAL
@@ -1427,6 +1442,15 @@ config LOCKD_V4
 config EXPORTFS
         tristate
 
+config NFS_ACL_SUPPORT
+        tristate
+        select FS_POSIX_ACL
+
+config NFS_COMMON
+        bool
+        depends on NFSD || NFS_FS
+        default y
+
 config SUNRPC
         tristate