Merge git://git.infradead.org/battery-2.6

[cascardo/linux.git] / fs / logfs / file.c

diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index e86376b..c2ad702 100644 (file)
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -196,7 +196,7 @@ long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                if (IS_RDONLY(inode))
                        return -EROFS;
 
-               if (!is_owner_or_cap(inode))
+               if (!inode_owner_or_capable(inode))
                        return -EACCES;
 
                err = get_user(flags, (int __user *)arg);