1 files changed, 10 insertions, 5 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index a8c833345fc9..fe4f2ee97b6c 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -784,8 +784,7 @@ cifs_rename_pending_delete(char *full_path, struct inode *inode, int xid)
         FILE_BASIC_INFO *info_buf;
 
         rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
-                         DELETE|FILE_WRITE_ATTRIBUTES,
-                         CREATE_NOT_DIR|CREATE_DELETE_ON_CLOSE,
+                         DELETE|FILE_WRITE_ATTRIBUTES, CREATE_NOT_DIR,
                          &netfid, &oplock, NULL, cifs_sb->local_nls,
                          cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
         if (rc != 0)
@@ -810,17 +809,23 @@ cifs_rename_pending_delete(char *full_path, struct inode *inode, int xid)
                 goto out_close;
         cifsInode->cifsAttrs = dosattr;
 
-        /* silly-rename the file */
-        CIFSSMBRenameOpenFile(xid, tcon, netfid, NULL, cifs_sb->local_nls,
+        /* rename the file */
+        rc = CIFSSMBRenameOpenFile(xid, tcon, netfid, NULL, cifs_sb->local_nls,
                                    cifs_sb->mnt_cifs_flags &
                                             CIFS_MOUNT_MAP_SPECIAL_CHR);
+        if (rc != 0)
+                goto out;
 
         /* set DELETE_ON_CLOSE */
         rc = CIFSSMBSetFileDisposition(xid, tcon, true, netfid, current->tgid);
 
         /*
          * some samba versions return -ENOENT when we try to set the file
-         * disposition here. Likely a samba bug, but work around it for now
+         * disposition here. Likely a samba bug, but work around it for now.
+         * This means that some cifsXXX files may hang around after they
+         * shouldn't.
+         *
+         * BB: remove this once fixed samba servers are in the field
          */
         if (rc == -ENOENT)
                 rc = 0;