diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-20 11:31:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:16 -0400 |
| commit | 178ea73521d64ba41d7aa5488fb9f549c6d4507d (patch) | |
| tree | 7fb6bfb6483577752e307a5bb2e3905658d44294 /fs/fuse | |
| parent | 07b8ce1ee87d291ff564c02cf878fae973317a52 (diff) | |
| download | kernel_goldelico_gta04-178ea73521d64ba41d7aa5488fb9f549c6d4507d.zip kernel_goldelico_gta04-178ea73521d64ba41d7aa5488fb9f549c6d4507d.tar.gz kernel_goldelico_gta04-178ea73521d64ba41d7aa5488fb9f549c6d4507d.tar.bz2 | |
kill check_acl callback of generic_permission()
its value depends only on inode and does not change; we might as
well store it in ->i_op->check_acl and be done with that.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index d5016071..0a2fcd8 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1018,7 +1018,7 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags) } if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { - err = generic_permission(inode, mask, flags, NULL); + err = generic_permission(inode, mask, flags); /* If permission is denied, try to refresh file attributes. This is also needed, because the root @@ -1027,7 +1027,7 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags) err = fuse_perm_getattr(inode, flags); if (!err) err = generic_permission(inode, mask, - flags, NULL); + flags); } /* Note: the opposite of the above test does not |