diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-20 19:28:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:24 -0400 |
commit | 10556cb21a0d0b24d95f00ea6df16f599a3345b2 (patch) | |
tree | 3d7d8dfba807805a55c154f1850717bf3b49f343 /fs/ocfs2 | |
parent | 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 (diff) |
->permission() sanitizing: don't pass flags to ->permission()
not used by the instances anymore.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/file.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/file.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index ecb52b028964..1406c37a5722 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -1279,11 +1279,11 @@ bail: | |||
1279 | return err; | 1279 | return err; |
1280 | } | 1280 | } |
1281 | 1281 | ||
1282 | int ocfs2_permission(struct inode *inode, int mask, unsigned int flags) | 1282 | int ocfs2_permission(struct inode *inode, int mask) |
1283 | { | 1283 | { |
1284 | int ret; | 1284 | int ret; |
1285 | 1285 | ||
1286 | if (flags & IPERM_FLAG_RCU) | 1286 | if (mask & MAY_NOT_BLOCK) |
1287 | return -ECHILD; | 1287 | return -ECHILD; |
1288 | 1288 | ||
1289 | ret = ocfs2_inode_lock(inode, NULL, 0); | 1289 | ret = ocfs2_inode_lock(inode, NULL, 0); |
diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h index f5afbbef6703..97bf761c9e7c 100644 --- a/fs/ocfs2/file.h +++ b/fs/ocfs2/file.h | |||
@@ -61,7 +61,7 @@ int ocfs2_zero_extend(struct inode *inode, struct buffer_head *di_bh, | |||
61 | int ocfs2_setattr(struct dentry *dentry, struct iattr *attr); | 61 | int ocfs2_setattr(struct dentry *dentry, struct iattr *attr); |
62 | int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry, | 62 | int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry, |
63 | struct kstat *stat); | 63 | struct kstat *stat); |
64 | int ocfs2_permission(struct inode *inode, int mask, unsigned int flags); | 64 | int ocfs2_permission(struct inode *inode, int mask); |
65 | 65 | ||
66 | int ocfs2_should_update_atime(struct inode *inode, | 66 | int ocfs2_should_update_atime(struct inode *inode, |
67 | struct vfsmount *vfsmnt); | 67 | struct vfsmount *vfsmnt); |