1 files changed, 10 insertions, 1 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 83f2606c76d0..0079696305c9 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -995,6 +995,15 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
                 return PTR_ERR(tlink);
         tcon = tlink_tcon(tlink);
 
+        /*
+         * We cannot rename the file if the server doesn't support
+         * CAP_INFOLEVEL_PASSTHRU
+         */
+        if (!(tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)) {
+                rc = -EBUSY;
+                goto out;
+        }
+
         rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
                          DELETE|FILE_WRITE_ATTRIBUTES, CREATE_NOT_DIR,
                          &netfid, &oplock, NULL, cifs_sb->local_nls,
@@ -1023,7 +1032,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
                                         current->tgid);
                 /* although we would like to mark the file hidden
                    if that fails we will still try to rename it */
-                if (rc != 0)
+                if (!rc)
                         cifsInode->cifsAttrs = dosattr;
                 else
                         dosattr = origattr; /* since not able to change them */