Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index edd3c0a..190d64b 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -1208,7 +1208,7 @@ int ufs_setattr(struct dentry *dentry, struct iattr *attr)
        unsigned int ia_valid = attr->ia_valid;
        int error;
 
        unsigned int ia_valid = attr->ia_valid;
        int error;
 

-       error = inode_change_ok(inode, attr);
+       error = setattr_prepare(dentry, attr);

        if (error)
                return error;
 
        if (error)
                return error;