aboutsummaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:28:19 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:24 -0400
commit10556cb21a0d0b24d95f00ea6df16f599a3345b2 (patch)
tree3d7d8dfba807805a55c154f1850717bf3b49f343 /fs/namei.c
parent2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 (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/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 684e0f30cf4c..c5c382620a86 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -287,7 +287,7 @@ int inode_permission(struct inode *inode, int mask)
287 } 287 }
288 288
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);
291 else 291 else
292 retval = generic_permission(inode, mask); 292 retval = generic_permission(inode, mask);
293 293
@@ -323,7 +323,7 @@ static inline int exec_permission(struct inode *inode, unsigned int flags)
323 mask |= MAY_NOT_BLOCK; 323 mask |= MAY_NOT_BLOCK;
324 324
325 if (inode->i_op->permission) { 325 if (inode->i_op->permission) {
326 ret = inode->i_op->permission(inode, mask, flags); 326 ret = inode->i_op->permission(inode, mask);
327 if (likely(!ret)) 327 if (likely(!ret))
328 goto ok; 328 goto ok;
329 } else { 329 } else {