summaryrefslogtreecommitdiff
path: root/fs/hpfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 11:31:30 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:16 -0400
commit178ea73521d64ba41d7aa5488fb9f549c6d4507d (patch)
tree7fb6bfb6483577752e307a5bb2e3905658d44294 /fs/hpfs
parent07b8ce1ee87d291ff564c02cf878fae973317a52 (diff)
downloadlinux-3.10-178ea73521d64ba41d7aa5488fb9f549c6d4507d.tar.gz
linux-3.10-178ea73521d64ba41d7aa5488fb9f549c6d4507d.tar.bz2
linux-3.10-178ea73521d64ba41d7aa5488fb9f549c6d4507d.zip
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/hpfs')
-rw-r--r--fs/hpfs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index acf95dab2aa..bd2ce7dd8df 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -398,7 +398,7 @@ again:
hpfs_unlock(dir->i_sb);
return -ENOSPC;
}
- if (generic_permission(inode, MAY_WRITE, 0, NULL) ||
+ if (generic_permission(inode, MAY_WRITE, 0) ||
!S_ISREG(inode->i_mode) ||
get_write_access(inode)) {
d_rehash(dentry);