Don't compile in unused reparse point symlink code

Recent Windows versions now create symlinks more frequently
and they do use this "reparse point" symlink mechanism.  We can of course
do symlinks nicely to Samba and other servers which support the
CIFS Unix Extensions and we can also do SFU symlinks and "client only"
"MF" symlinks optionally, but for recent Windows we currently can not
handle the common "reparse point" symlinks fully, removing the caller
for this. We will need to extend and reenable this "reparse point" worker
code in cifs and fix cifs_symlink to call this.  In the interim this code
has been moved to its own config option so it is not compiled in by default
until cifs_symlink fixed up (and tested) to use this.

CC: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/README b/fs/cifs/README
index 74ab165fc646aea64d873900b64696a2ef35f471..4a3ca0e5ca24d3ad6445dfa73a5a76dc73e590c0 100644 (file)
--- a/fs/cifs/README
+++ b/fs/cifs/README
@@ -704,18 +704,6 @@ the start of smb requests and responses can be enabled via:
 
        echo 1 > /proc/fs/cifs/traceSMB
 
-Two other experimental features are under development. To test these
-requires enabling CONFIG_CIFS_EXPERIMENTAL
-
-       cifsacl support needed to retrieve approximated mode bits based on
-               the contents on the CIFS ACL.
-
-       lease support: cifs will check the oplock state before calling into
-       the vfs to see if we can grant a lease on a file.
-
-       DNOTIFY fcntl: needed for support of directory change 
-                           notification and perhaps later for file leases)
-
 Per share (per client mount) statistics are available in /proc/fs/cifs/Stats
 if the kernel was configured with cifs statistics enabled.  The statistics
 represent the number of successful (ie non-zero return code from the server) 

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 34bbd5cf46d0dab3fce327dff632e53d9eb138bc..da7a4923783fca54a4b1884edd204d08ac5f8176 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -304,12 +304,13 @@ extern int CIFSSMBUnixQuerySymLink(const int xid,
                        struct cifsTconInfo *tcon,
                        const unsigned char *searchName, char **syminfo,
                        const struct nls_table *nls_codepage);
+#ifdef CONFIG_CIFS_SYMLINK_EXPERIMENTAL
 extern int CIFSSMBQueryReparseLinkInfo(const int xid,
                        struct cifsTconInfo *tcon,
                        const unsigned char *searchName,
                        char *symlinkinfo, const int buflen, __u16 fid,
                        const struct nls_table *nls_codepage);
-
+#endif /* temporarily unused until cifs_symlink fixed */
 extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon,
                        const char *fileName, const int disposition,
                        const int access_flags, const int omode,

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5630282f28218512a45d6b1a0c361f6f08200088..ae5e451a0d089a274245d8a2eed40edeab5fd8d0 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -2516,7 +2516,17 @@ querySymLinkRetry:
        return rc;
 }
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL
+#ifdef CONFIG_CIFS_SYMLINK_EXPERIMENTAL
+/*
+ *     Recent Windows versions now create symlinks more frequently
+ *     and they use the "reparse point" mechanism below.  We can of course
+ *     do symlinks nicely to Samba and other servers which support the
+ *     CIFS Unix Extensions and we can also do SFU symlinks and "client only"
+ *     "MF" symlinks optionally, but for recent Windows we really need to
+ *     reenable the code below and fix the cifs_symlink callers to handle this.
+ *     In the interim this code has been moved to its own config option so
+ *     it is not compiled in by default until callers fixed up and more tested.
+ */
 int
 CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon,
                        const unsigned char *searchName,
@@ -2618,7 +2628,7 @@ qreparse_out:
 
        return rc;
 }
-#endif /* CIFS_EXPERIMENTAL */
+#endif /* CIFS_SYMLINK_EXPERIMENTAL */ /* BB temporarily unused */
 
 #ifdef CONFIG_CIFS_POSIX