2 files changed, 12 insertions, 0 deletions

diff --git a/fs/cifs/README b/fs/cifs/README
index bd2343d4c6a6..cbe26fe40120 100644
--- a/fs/cifs/README
+++ b/fs/cifs/README
@@ -463,6 +463,9 @@ A partial list of the supported mount options follows:
                 with cifs style mandatory byte range locks (and most
                 cifs servers do not yet support requesting advisory
                 byte range locks).
+ nodfs          Disable DFS (global name space support) even if the
+                server claims to support it.  This can help work around
+                a problem with parsing of DFS paths with Samba 3.0.24 server.
  remount        remount the share (often used to change from ro to rw mounts
                 or vice versa)
  cifsacl        Report mode bits (e.g. on stat) based on the Windows ACL for
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4c13bcdb92a5..17ca8ce81bb7 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -90,6 +90,7 @@ struct smb_vol {
         bool nocase:1;     /* request case insensitive filenames */
         bool nobrl:1;      /* disable sending byte range locks to srv */
         bool seal:1;       /* request transport encryption on share */
+        bool nodfs:1;
         unsigned int rsize;
         unsigned int wsize;
         unsigned int sockopt;
@@ -1218,6 +1219,8 @@ cifs_parse_mount_options(char *options, const char *devname,
                         vol->sfu_emul = 1;
                 } else if (strnicmp(data, "nosfu", 5) == 0) {
                         vol->sfu_emul = 0;
+                } else if (strnicmp(data, "nodfs", 5) == 0) {
+                        vol->nodfs = 1;
                 } else if (strnicmp(data, "posixpaths", 10) == 0) {
                         vol->posix_paths = 1;
                 } else if (strnicmp(data, "noposixpaths", 12) == 0) {
@@ -2197,6 +2200,12 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
                                                 volume_info.UNC,
                                                 tcon, cifs_sb->local_nls);
                                         cFYI(1, ("CIFS Tcon rc = %d", rc));
+                                        if (volume_info.nodfs) {
+                                                tcon->Flags &=
+                                                        ~SMB_SHARE_IS_IN_DFS;
+                                                cFYI(1, ("DFS disabled (%d)",
+                                                        tcon->Flags));
+                                        }
                                 }
                                 if (!rc) {
                                         atomic_inc(&pSesInfo->inUse);