1 files changed, 13 insertions, 3 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 239e1fb33000..d8eb6a74b211 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3239,10 +3239,20 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
         }
         if (pvolume_info->mfsymlinks) {
                 if (pvolume_info->sfu_emul) {
-                        cifs_dbg(VFS, "mount option mfsymlinks ignored if sfu mount option is used\n");
-                } else {
-                        cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_MF_SYMLINKS;
+                        /*
+                         * Our SFU ("Services for Unix" emulation does not allow
+                         * creating symlinks but does allow reading existing SFU
+                         * symlinks (it does allow both creating and reading SFU
+                         * style mknod and FIFOs though). When "mfsymlinks" and
+                         * "sfu" are both enabled at the same time, it allows
+                         * reading both types of symlinks, but will only create
+                         * them with mfsymlinks format. This allows better
+                         * Apple compatibility (probably better for Samba too)
+                         * while still recognizing old Windows style symlinks.
+                         */
+                        cifs_dbg(VFS, "mount options mfsymlinks and sfu both enabled\n");
                 }
+                cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_MF_SYMLINKS;
         }
 
         if ((pvolume_info->cifs_acl) && (pvolume_info->dynperm))