diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-21 01:12:17 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 07:43:21 +0200 |
commit | 7e40145eb111a5192e6d819f764db9d6828d1abb (patch) | |
tree | 3249952a751de12465e8d66c63328445e9242f3a /fs/ocfs2 | |
parent | ->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl() (diff) | |
download | linux-7e40145eb111a5192e6d819f764db9d6828d1abb.tar.xz linux-7e40145eb111a5192e6d819f764db9d6828d1abb.zip |
->permission() sanitizing: don't pass flags to ->check_acl()
not used in the instances anymore.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/acl.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/acl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c index 4b683ccc4506..1cee970eb55a 100644 --- a/fs/ocfs2/acl.c +++ b/fs/ocfs2/acl.c @@ -290,7 +290,7 @@ static int ocfs2_set_acl(handle_t *handle, return ret; } -int ocfs2_check_acl(struct inode *inode, int mask, unsigned int flags) +int ocfs2_check_acl(struct inode *inode, int mask) { struct ocfs2_super *osb; struct buffer_head *di_bh = NULL; diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h index 4fe7c9cf4bfb..5c5d31f05853 100644 --- a/fs/ocfs2/acl.h +++ b/fs/ocfs2/acl.h @@ -26,7 +26,7 @@ struct ocfs2_acl_entry { __le32 e_id; }; -extern int ocfs2_check_acl(struct inode *, int, unsigned int); +extern int ocfs2_check_acl(struct inode *, int); extern int ocfs2_acl_chmod(struct inode *); extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *, struct buffer_head *, struct buffer_head *, |