2 files changed, 15 insertions, 10 deletions

diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index 5988b6060e8a..38b9bf4f5a6b 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -518,10 +518,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
                 rc = query_mf_symlink(xid, tcon, cifs_sb, full_path,
                                       &target_path);
 
-        if ((rc != 0) && cap_unix(tcon->ses))
-                rc = CIFSSMBUnixQuerySymLink(xid, tcon, full_path, &target_path,
-                                             cifs_sb->local_nls);
-        else if (rc != 0 && server->ops->query_symlink)
+        if (rc != 0 && server->ops->query_symlink)
                 rc = server->ops->query_symlink(xid, tcon, full_path,
                                                 &target_path, cifs_sb);
 
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 1470ec4fc39d..988fddb72025 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -918,23 +918,31 @@ cifs_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
 
         cifs_dbg(FYI, "%s: path: %s\n", __func__, full_path);
 
+        /* Check for unix extensions */
+        if (cap_unix(tcon->ses)) {
+                rc = CIFSSMBUnixQuerySymLink(xid, tcon, full_path, target_path,
+                                             cifs_sb->local_nls);
+                goto out;
+        }
+
         rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
                          FILE_READ_ATTRIBUTES, OPEN_REPARSE_POINT, &netfid,
                          &oplock, NULL, cifs_sb->local_nls,
                          cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
         if (rc)
-                return rc;
+                goto out;
 
         rc = CIFSSMBQuerySymLink(xid, tcon, netfid, target_path,
                                  cifs_sb->local_nls);
-        if (rc) {
-                CIFSSMBClose(xid, tcon, netfid);
-                return rc;
-        }
+        if (rc)
+                goto out_close;
 
         convert_delimiter(*target_path, '/');
+out_close:
         CIFSSMBClose(xid, tcon, netfid);
-        cifs_dbg(FYI, "%s: target path: %s\n", __func__, *target_path);
+out:
+        if (!rc)
+                cifs_dbg(FYI, "%s: target path: %s\n", __func__, *target_path);
         return rc;
 }