diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-12-06 12:52:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-12-06 20:22:39 +0000 |
| commit | 79df1baeec29022e4181f2964187b88661ef5517 (patch) | |
| tree | 2692721239eeb8bbfe591fc1ef038c90e61e8826 /fs/cifs/cifsacl.c | |
| parent | ebb27386ffd2fcd0fad141e0eee97b8070f94ee2 (diff) | |
| download | talos-obmc-linux-79df1baeec29022e4181f2964187b88661ef5517.tar.gz talos-obmc-linux-79df1baeec29022e4181f2964187b88661ef5517.zip | |
cifs: fix use of CONFIG_CIFS_ACL
Some of the code under CONFIG_CIFS_ACL is dependent upon code under
CONFIG_CIFS_EXPERIMENTAL, but the Kconfig options don't reflect that
dependency. Move more of the ACL code out from under
CONFIG_CIFS_EXPERIMENTAL and under CONFIG_CIFS_ACL.
Also move find_readable_file out from other any sort of Kconfig
option and make it a function normally compiled in.
Reported-and-Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsacl.c')
| -rw-r--r-- | fs/cifs/cifsacl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index c6ebea088ac7..a437ec391a01 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -30,8 +30,6 @@ #include "cifs_debug.h" -#ifdef CONFIG_CIFS_EXPERIMENTAL - static struct cifs_wksid wksidarr[NUM_WK_SIDS] = { {{1, 0, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0} }, "null user"}, {{1, 1, {0, 0, 0, 0, 0, 1}, {0, 0, 0, 0, 0} }, "nobody"}, @@ -774,4 +772,3 @@ int mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode) return rc; } -#endif /* CONFIG_CIFS_EXPERIMENTAL */ |
