commit 10556cb21a0d0b24d95f00ea6df16f599a3345b2
author Al Viro <viro@zeniv.linux.org.uk> Mon Jun 20 19:28:19 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Jul 20 01:43:24 2011 -0400
tree 3d7d8dfba807805a55c154f1850717bf3b49f343
parent 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890

->permission() sanitizing: don't pass flags to ->permission()

not used by the instances anymore.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/ocfs2/file.c

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index ecb52b0..1406c37 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1279,11 +1279,11 @@
 	return err;
 }
 
-int ocfs2_permission(struct inode *inode, int mask, unsigned int flags)
+int ocfs2_permission(struct inode *inode, int mask)
 {
 	int ret;
 
-	if (flags & IPERM_FLAG_RCU)
+	if (mask & MAY_NOT_BLOCK)
 		return -ECHILD;
 
 	ret = ocfs2_inode_lock(inode, NULL, 0);

fs/ocfs2/file.h

diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h
index f5afbbe..97bf761 100644
--- a/fs/ocfs2/file.h
+++ b/fs/ocfs2/file.h
@@ -61,7 +61,7 @@
 int ocfs2_setattr(struct dentry *dentry, struct iattr *attr);
 int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
 		  struct kstat *stat);
-int ocfs2_permission(struct inode *inode, int mask, unsigned int flags);
+int ocfs2_permission(struct inode *inode, int mask);
 
 int ocfs2_should_update_atime(struct inode *inode,
 			      struct vfsmount *vfsmnt);