diff --git a/[refs] b/[refs] index 0628efa507ee..bc9102240de6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86c96b4bb70dac67d6815e09a0949427d439b280 +refs/heads/master: cdbce9c87e4ebd186389919b95e49592ec35dae6 diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index d7b85dfb0df3..05b525812adb 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -1219,6 +1219,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); else if (attrs->ia_valid & ATTR_MODE) { + rc = 0; if ((mode & S_IWUGO) == 0) /* not writeable */ { if ((cifsInode->cifsAttrs & ATTR_READONLY) == 0) time_buf.Attributes =