From 8400b85bb3ca74a0b1297d97cb5659b69a5e0836 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 19 Jun 2011 11:49:08 -0400
Subject: [PATCH] --- yaml --- r: 257307 b: refs/heads/master c:
 6f2861097467852f2271c2b40f9c3d1d01757048 h: refs/heads/master i:   257305:
 4c63eb70a639bccc7406ae4e6b6bc2fe0f8ea06c   257303:
 e212595d3c56d2cae531dc6674660cf7b4848587 v: v3

---
 [refs]              | 2 +-
 trunk/fs/udf/file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 897aa9e758d9..507b8502e7ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cf27141cbe0239f48ec6f0b37bad347d51d1785
+refs/heads/master: 6f2861097467852f2271c2b40f9c3d1d01757048
diff --git a/trunk/fs/udf/file.c b/trunk/fs/udf/file.c
index 2a346bb1d9f5..d8ffa7cc661d 100644
--- a/trunk/fs/udf/file.c
+++ b/trunk/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;