summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2013-03-05 20:25:55 +0100
committerSteve French <sfrench@us.ibm.com>2013-03-07 01:28:35 +0100
commit72d282dc5109e5dc0d963be020604e0cc82f7ed7 (patch)
tree6f59f8b91ae28efd5496bee9b2190cb9f8e86345 /fs
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
downloadlinux-72d282dc5109e5dc0d963be020604e0cc82f7ed7.tar.xz
linux-72d282dc5109e5dc0d963be020604e0cc82f7ed7.zip
cifs: Fix bug when checking error condition in cifs_rename_pending_delete()
Fix check for error condition after setting attributes with CIFSSMBSetFileInfo(). Signed-off-by: Sachin Prabhu <sprabhu@redhat.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Pavel Shilovsky <piastry@etersoft.ru> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to '')
-rw-r--r--fs/cifs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 83f2606c76d0..e7ae45cd94ef 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1023,7 +1023,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 */