From b2d7a1eff9f9c553bd749d970864c92ead509b1e Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Mon, 11 Feb 2008 17:12:31 -0500 Subject: [PATCH] --- yaml --- r: 92817 b: refs/heads/master c: 78dd0992a3462e05138cf4d08df759bf1c7a08c9 h: refs/heads/master i: 92815: 04db4be0e607f3828802503e64220ff44a60de7a v: v3 --- [refs] | 2 +- trunk/fs/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34ca008fe861..693319aa03c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 892069552eedfa0d2fca41680d076a5bc0a3c26e +refs/heads/master: 78dd0992a3462e05138cf4d08df759bf1c7a08c9 diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index 94250f0c0cc8..b609843f8d63 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -1694,7 +1694,6 @@ config NFSD select LOCKD select SUNRPC select EXPORTFS - select NFSD_V2_ACL if NFSD_V3_ACL select NFS_ACL_SUPPORT if NFSD_V2_ACL select CRYPTO_MD5 if NFSD_V4 select CRYPTO if NFSD_V4 @@ -1738,6 +1737,7 @@ config NFSD_V3 config NFSD_V3_ACL bool "NFS server support for the NFSv3 ACL protocol extension" depends on NFSD_V3 + select NFSD_V2_ACL help Solaris NFS servers support an auxiliary NFSv3 ACL protocol that never became an official part of the NFS version 3 protocol.