projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[cascardo/linux.git]
/
fs
/
btrfs
/
ctree.h
diff --git
a/fs/btrfs/ctree.h
b/fs/btrfs/ctree.h
index
7219537
..
2c98b3a
100644
(file)
--- a/
fs/btrfs/ctree.h
+++ b/
fs/btrfs/ctree.h
@@
-2583,7
+2583,7
@@
do { \
/* acl.c */
#ifdef CONFIG_BTRFS_FS_POSIX_ACL
-int btrfs_check_acl(struct inode *inode, int mask);
+int btrfs_check_acl(struct inode *inode, int mask
, unsigned int flags
);
#else
#define btrfs_check_acl NULL
#endif