diff options
Diffstat (limited to 'fs/jfs/acl.c')
-rw-r--r-- | fs/jfs/acl.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index 687a1ae42e3f..b3a32caf2b45 100644 --- a/fs/jfs/acl.c +++ b/fs/jfs/acl.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "jfs_xattr.h" | 27 | #include "jfs_xattr.h" |
28 | #include "jfs_acl.h" | 28 | #include "jfs_acl.h" |
29 | 29 | ||
30 | static struct posix_acl *jfs_get_acl(struct inode *inode, int type) | 30 | struct posix_acl *jfs_get_acl(struct inode *inode, int type) |
31 | { | 31 | { |
32 | struct posix_acl *acl; | 32 | struct posix_acl *acl; |
33 | char *ea_name; | 33 | char *ea_name; |
@@ -114,22 +114,6 @@ out: | |||
114 | return rc; | 114 | return rc; |
115 | } | 115 | } |
116 | 116 | ||
117 | int jfs_check_acl(struct inode *inode, int mask) | ||
118 | { | ||
119 | struct posix_acl *acl; | ||
120 | |||
121 | acl = jfs_get_acl(inode, ACL_TYPE_ACCESS); | ||
122 | if (IS_ERR(acl)) | ||
123 | return PTR_ERR(acl); | ||
124 | if (acl) { | ||
125 | int error = posix_acl_permission(inode, acl, mask); | ||
126 | posix_acl_release(acl); | ||
127 | return error; | ||
128 | } | ||
129 | |||
130 | return -EAGAIN; | ||
131 | } | ||
132 | |||
133 | int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir) | 117 | int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir) |
134 | { | 118 | { |
135 | struct posix_acl *acl = NULL; | 119 | struct posix_acl *acl = NULL; |