commit 7e40145eb111a5192e6d819f764db9d6828d1abb
author Al Viro <viro@zeniv.linux.org.uk> Mon Jun 20 19:12:17 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Jul 20 01:43:21 2011 -0400
tree 3249952a751de12465e8d66c63328445e9242f3a
parent 9c2c703929e4c41210cfa6e3f599514421bab8dc

->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>

fs/btrfs/acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index a25a4a2..9f62ab2 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -195,7 +195,7 @@
 	return ret;
 }
 
-int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
+int btrfs_check_acl(struct inode *inode, int mask)
 {
 	int error = -EAGAIN;
 

fs/btrfs/ctree.h

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 3b859a3..9864cec 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2642,7 +2642,7 @@
 
 /* acl.c */
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
-int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags);
+int btrfs_check_acl(struct inode *inode, int mask);
 #else
 #define btrfs_check_acl NULL
 #endif