aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:12:17 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:21 -0400
commit7e40145eb111a5192e6d819f764db9d6828d1abb (patch)
tree3249952a751de12465e8d66c63328445e9242f3a /fs/btrfs
parent9c2c703929e4c41210cfa6e3f599514421bab8dc (diff)
->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/btrfs')
-rw-r--r--fs/btrfs/acl.c2
-rw-r--r--fs/btrfs/ctree.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index a25a4a2e0df2..9f62ab2a7282 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -195,7 +195,7 @@ out:
195 return ret; 195 return ret;
196} 196}
197 197
198int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags) 198int btrfs_check_acl(struct inode *inode, int mask)
199{ 199{
200 int error = -EAGAIN; 200 int error = -EAGAIN;
201 201
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 3b859a3e6a0e..9864cec801ed 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2642,7 +2642,7 @@ do { \
2642 2642
2643/* acl.c */ 2643/* acl.c */
2644#ifdef CONFIG_BTRFS_FS_POSIX_ACL 2644#ifdef CONFIG_BTRFS_FS_POSIX_ACL
2645int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags); 2645int btrfs_check_acl(struct inode *inode, int mask);
2646#else 2646#else
2647#define btrfs_check_acl NULL 2647#define btrfs_check_acl NULL
2648#endif 2648#endif