diff --git a/[refs] b/[refs]
index fdf446df317d..9f7aeefc443b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bfe73c258addc388b90fe8c2c6bbc0f0c9c10dd
+refs/heads/master: d036f50fc202e1a851a25dc5edc215ebd0086201
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 2e7a4ea26ab9..6926023af878 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -2522,6 +2522,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 
 	/* get referral if needed */
 	if (rc == -EREMOTE) {
+#ifdef CONFIG_CIFS_DFS_UPCALL
 		/* convert forward to back slashes in prepath here if needed */
 		if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) == 0)
 			convert_delimiter(cifs_sb->prepath,
@@ -2557,6 +2558,9 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 			kfree(full_path);
 			goto try_mount_again;
 		}
+#else /* No DFS support, return error on mount */
+		rc = -EOPNOTSUPP;
+#endif
 	}
 
 mount_fail_check: