cifs: cleanup: Rename and remove config flags

Remove config flag CIFS_EXPERIMENTAL.
Do export operations under new config flag CIFS_NFSD_EXPORT

Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig
index 2a492aad40d1e1b5fe57a06c113d9cc1608b1656..7c584be27fdfcbd6097dd9aa80de607f1bd19b11 100644 (file)
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
@@ -172,16 +172,8 @@ config CIFS_SMB2
 
          Unless you are a developer or tester, say N.
 
-config CIFS_EXPERIMENTAL
-         bool "CIFS Experimental Features (EXPERIMENTAL)"
+config CIFS_NFSD_EXPORT
+         bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)"
          depends on CIFS && EXPERIMENTAL
          help
-           Enables cifs features under testing. These features are
-           experimental and currently include DFS support and directory
-           change notification ie fcntl(F_DNOTIFY), as well as the upcall
-           mechanism which will be used for Kerberos session negotiation
-           and uid remapping.  Some of these features also may depend on
-           setting a value of 1 to the pseudo-file /proc/fs/cifs/Experimental
-           (which is disabled by default). See the file fs/cifs/README
-           for more details.  If unsure, say N.
-
+          Allows NFS server to export a CIFS mounted share (nfsd over cifs)

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b45d38b8911678fa7410a3dfe0b2a83f4f16181b..30fc505b7ef17c53d4402dd660f033298711da34 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -184,12 +184,12 @@ cifs_read_super(struct super_block *sb, void *data,
        else
                sb->s_d_op = &cifs_dentry_ops;
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CIFS_NFSD_EXPORT
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
                cFYI(1, "export ops supported");
                sb->s_export_op = &cifs_export_ops;
        }
-#endif /* EXPERIMENTAL */
+#endif /* CIFS_NFSD_EXPORT */
 
        return 0;
 

diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index f191244f266eb0b605164f53297eb8723697186a..371d021815b13ef6b5ad6275dff2b66be51c39e2 100644 (file)
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -123,9 +123,9 @@ extern ssize_t      cifs_getxattr(struct dentry *, const char *, void *, size_t);
 extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
 extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CIFS_NFSD_EXPORT
 extern const struct export_operations cifs_export_ops;
-#endif /* EXPERIMENTAL */
+#endif /* CIFS_NFSD_EXPORT */
 
 #define CIFS_VERSION   "1.71"
 #endif                         /* _CIFSFS_H */

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index ae5e451a0d089a274245d8a2eed40edeab5fd8d0..e6374dda3c6a67144fc98e61d1d644f3704868c1 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -541,10 +541,6 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                server->secType = RawNTLMSSP;
        else if (secFlags & CIFSSEC_MAY_LANMAN)
                server->secType = LANMAN;
-/* #ifdef CONFIG_CIFS_EXPERIMENTAL
-       else if (secFlags & CIFSSEC_MAY_PLNTXT)
-               server->secType = ??
-#endif */
        else {
                rc = -EOPNOTSUPP;
                cERROR(1, "Invalid security type");

diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index 993f82045bf6f84f94d78ac597ccc7aaa1123a36..55d87ac5200024a7cc2def363c13183ab0e95b7e 100644 (file)
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -45,7 +45,7 @@
 #include "cifs_debug.h"
 #include "cifsfs.h"
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CIFS_NFSD_EXPORT
 static struct dentry *cifs_get_parent(struct dentry *dentry)
 {
        /* BB need to add code here eventually to enable export via NFSD */
@@ -63,5 +63,5 @@ const struct export_operations cifs_export_ops = {
        .encode_fs =  */
 };
 
-#endif /* EXPERIMENTAL */
+#endif /* CIFS_NFSD_EXPORT */