Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[~andy/linux] / fs / ocfs2 / ioctl.c

diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index f97a213223e8faca4104c2d9f3bc5d2cfff82d29..8f13c5989eaeeecd543be983cec37176c1c54ece 100644 (file)
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -96,7 +96,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
        }
 
        status = -EACCES;
-       if (!is_owner_or_cap(inode))
+       if (!inode_owner_or_capable(inode))
                goto bail_unlock;
 
        if (!S_ISDIR(inode->i_mode))