projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
jffs2
/
acl.c
diff --git
a/fs/jffs2/acl.c
b/fs/jffs2/acl.c
index 8fcb6239218e53b7b9ced59a0ee9a854f4c77175..7edb62e97419c57d9e1ba28de2ca810798bfed6a 100644
(file)
--- a/
fs/jffs2/acl.c
+++ b/
fs/jffs2/acl.c
@@
-258,7
+258,7
@@
static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
return rc;
}
return rc;
}
-
static
int jffs2_check_acl(struct inode *inode, int mask)
+int jffs2_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;
int rc;
{
struct posix_acl *acl;
int rc;
@@
-274,11
+274,6
@@
static int jffs2_check_acl(struct inode *inode, int mask)
return -EAGAIN;
}
return -EAGAIN;
}
-int jffs2_permission(struct inode *inode, int mask)
-{
- return generic_permission(inode, mask, jffs2_check_acl);
-}
-
int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
{
struct posix_acl *acl, *clone;
int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
{
struct posix_acl *acl, *clone;