Commit 25720873 authored by Shirish Pargaonkar's avatar Shirish Pargaonkar Committed by Steve French
Browse files

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: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent b34cb85c

fs/cifs/Kconfig

+3 −11
Original line number Diff line number Diff line
@@ -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)

fs/cifs/cifsfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/cifs/cifsfs.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

fs/cifs/cifssmb.c

+0 −4
Original line number Diff line number Diff line
@@ -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");

fs/cifs/export.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */