diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-20 19:16:29 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:22 -0400 |
commit | 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 (patch) | |
tree | bbcebc14bffd000f1dfcbf37e64f56d2f49581ac /fs/namei.c | |
parent | 7e40145eb111a5192e6d819f764db9d6828d1abb (diff) |
->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.c | 4 |
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: | |||
224 | * request cannot be satisfied (eg. requires blocking or too much complexity). | 224 | * request cannot be satisfied (eg. requires blocking or too much complexity). |
225 | * It would then be called again in ref-walk mode. | 225 | * It would then be called again in ref-walk mode. |
226 | */ | 226 | */ |
227 | int generic_permission(struct inode *inode, int mask, unsigned int flags) | 227 | int generic_permission(struct inode *inode, int mask) |
228 | { | 228 | { |
229 | int ret; | 229 | int ret; |
230 | 230 | ||
@@ -289,7 +289,7 @@ int inode_permission(struct inode *inode, int mask) | |||
289 | if (inode->i_op->permission) | 289 | if (inode->i_op->permission) |
290 | retval = inode->i_op->permission(inode, mask, 0); | 290 | retval = inode->i_op->permission(inode, mask, 0); |
291 | else | 291 | else |
292 | retval = generic_permission(inode, mask, 0); | 292 | retval = generic_permission(inode, mask); |
293 | 293 | ||
294 | if (retval) | 294 | if (retval) |
295 | return retval; | 295 | return retval; |