Merge remote-tracking branch 'jk/vfs' into work.misc

[cascardo/linux.git] / fs / cifs / inode.c

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 0b4a355..7ab5be7 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -2154,7 +2154,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                attrs->ia_valid |= ATTR_FORCE;
 
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                attrs->ia_valid |= ATTR_FORCE;
 

-       rc = inode_change_ok(inode, attrs);
+       rc = setattr_prepare(direntry, attrs);

        if (rc < 0)
                goto out;
 
        if (rc < 0)
                goto out;
 


@@ -2294,7 +2294,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                attrs->ia_valid |= ATTR_FORCE;
 
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                attrs->ia_valid |= ATTR_FORCE;
 

-       rc = inode_change_ok(inode, attrs);
+       rc = setattr_prepare(direntry, attrs);

        if (rc < 0) {
                free_xid(xid);
                return rc;
        if (rc < 0) {
                free_xid(xid);
                return rc;