summaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:16:29 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:22 -0400
commit2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 (patch)
treebbcebc14bffd000f1dfcbf37e64f56d2f49581ac /fs/namei.c
parent7e40145eb111a5192e6d819f764db9d6828d1abb (diff)
downloadlinux-2830ba7f34ebb27c4e5b8b6ef408cd6d74860890.tar.gz
linux-2830ba7f34ebb27c4e5b8b6ef408cd6d74860890.tar.bz2
linux-2830ba7f34ebb27c4e5b8b6ef408cd6d74860890.zip
->permission() sanitizing: don't pass flags to generic_permission()
redundant; all callers get it duplicated in mask & MAY_NOT_BLOCK and none of them removes that bit. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 560fd1dff1d0..684e0f30cf4c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -224,7 +224,7 @@ other_perms:
* request cannot be satisfied (eg. requires blocking or too much complexity).
* It would then be called again in ref-walk mode.
*/
-int generic_permission(struct inode *inode, int mask, unsigned int flags)
+int generic_permission(struct inode *inode, int mask)
{
int ret;
@@ -289,7 +289,7 @@ int inode_permission(struct inode *inode, int mask)
if (inode->i_op->permission)
retval = inode->i_op->permission(inode, mask, 0);
else
- retval = generic_permission(inode, mask, 0);
+ retval = generic_permission(inode, mask);
if (retval)
return retval;