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/ceph | |
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/ceph')
-rw-r--r-- | fs/ceph/inode.c | 4 | ||||
-rw-r--r-- | fs/ceph/super.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 9c169741b416..dfb2831d8d85 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c | |||
@@ -1795,11 +1795,11 @@ int ceph_do_getattr(struct inode *inode, int mask) | |||
1795 | * Check inode permissions. We verify we have a valid value for | 1795 | * Check inode permissions. We verify we have a valid value for |
1796 | * the AUTH cap, then call the generic handler. | 1796 | * the AUTH cap, then call the generic handler. |
1797 | */ | 1797 | */ |
1798 | int ceph_permission(struct inode *inode, int mask, unsigned int flags) | 1798 | int ceph_permission(struct inode *inode, int mask) |
1799 | { | 1799 | { |
1800 | int err; | 1800 | int err; |
1801 | 1801 | ||
1802 | if (flags & IPERM_FLAG_RCU) | 1802 | if (mask & MAY_NOT_BLOCK) |
1803 | return -ECHILD; | 1803 | return -ECHILD; |
1804 | 1804 | ||
1805 | err = ceph_do_getattr(inode, CEPH_CAP_AUTH_SHARED); | 1805 | err = ceph_do_getattr(inode, CEPH_CAP_AUTH_SHARED); |
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index f5cabefa98dc..56c41ef47cad 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h | |||
@@ -692,7 +692,7 @@ extern void ceph_queue_invalidate(struct inode *inode); | |||
692 | extern void ceph_queue_writeback(struct inode *inode); | 692 | extern void ceph_queue_writeback(struct inode *inode); |
693 | 693 | ||
694 | extern int ceph_do_getattr(struct inode *inode, int mask); | 694 | extern int ceph_do_getattr(struct inode *inode, int mask); |
695 | extern int ceph_permission(struct inode *inode, int mask, unsigned int flags); | 695 | extern int ceph_permission(struct inode *inode, int mask); |
696 | extern int ceph_setattr(struct dentry *dentry, struct iattr *attr); | 696 | extern int ceph_setattr(struct dentry *dentry, struct iattr *attr); |
697 | extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry, | 697 | extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry, |
698 | struct kstat *stat); | 698 | struct kstat *stat); |