diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 21:21:04 +0000 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 21:21:04 +0000 |
| commit | f652f6c5b7cfdf139f4155d78f397e99ae1c4acc (patch) | |
| tree | 71c6344688bf56ea6aaf18c586ab69ff4f077ade /fs/gfs2/acl.h | |
| parent | 140e3008e7fe1526cbb12f8f07dbc273ac713b75 (diff) | |
| parent | c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 (diff) | |
| download | kernel_goldelico_gta04-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.zip kernel_goldelico_gta04-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.tar.gz kernel_goldelico_gta04-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.tar.bz2 | |
Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus
Diffstat (limited to 'fs/gfs2/acl.h')
| -rw-r--r-- | fs/gfs2/acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/acl.h b/fs/gfs2/acl.h index b522b0c..a93907c 100644 --- a/fs/gfs2/acl.h +++ b/fs/gfs2/acl.h @@ -16,7 +16,7 @@ #define GFS2_POSIX_ACL_DEFAULT "posix_acl_default" #define GFS2_ACL_MAX_ENTRIES 25 -extern int gfs2_check_acl(struct inode *inode, int mask); +extern int gfs2_check_acl(struct inode *inode, int mask, unsigned int); extern int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode); extern int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr); extern const struct xattr_handler gfs2_xattr_system_handler; |