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

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

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index d4c6915..c83846f 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -219,7 +219,7 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
                     "orangefs_setattr: called on %pd\n",
                     dentry);
 
                     "orangefs_setattr: called on %pd\n",
                     dentry);
 

-       ret = inode_change_ok(inode, iattr);
+       ret = setattr_prepare(dentry, iattr);

        if (ret)
                goto out;
 
        if (ret)
                goto out;