Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 6c82e5bac03932bf11e154b9c7c9e86b774e93cd..22764c7c8382ce607ca5f9ec9b1a2f48e3d15c4e 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -159,7 +159,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
 
        /* O_NOATIME can only be set by the owner or superuser */
        if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
-               if (!is_owner_or_cap(inode))
+               if (!inode_owner_or_capable(inode))
                        return -EPERM;
 
        /* required for strict SunOS emulation */