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

[linux-2.6-block.git] / fs / nilfs2 / inode.c

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index bf084035f83c633144abe22487ecb6548ef05855..c7f4fef9ebf5fa8b1215fc065dbdc68ab84dd039 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -829,7 +829,7 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
        struct super_block *sb = inode->i_sb;
        int err;
 
-       err = inode_change_ok(inode, iattr);
+       err = setattr_prepare(dentry, iattr);
        if (err)
                return err;