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

[~andy/linux] / fs / udf / file.c

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 2a346bb1d9f5f082338555fb50e754e19eb4aa67..d8ffa7cc661d2a28537bc8977c8902647b37b65e 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -150,7 +150,7 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        long old_block, new_block;
        int result = -EINVAL;
 
-       if (file_permission(filp, MAY_READ) != 0) {
+       if (inode_permission(inode, MAY_READ) != 0) {
                udf_debug("no permission to access inode %lu\n", inode->i_ino);
                result = -EPERM;
                goto out;