diff --git a/[refs] b/[refs] index 19ffa847b7d5..0956f9387806 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3270958b717a13d0228803254609c19184854b9b +refs/heads/master: 413460980ea7796582bce672be85879be0865ada diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 232ab16d7fd4..23cca214ede7 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -813,7 +813,7 @@ cifs_rename_pending_delete(char *full_path, struct dentry *dentry, int xid) 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 != 0) cifsInode->cifsAttrs = dosattr; else dosattr = origattr; /* since not able to change them */