Skip to content

L
linux
Commit 290c263b authored by Al Viro's avatar Al Viro
Browse files
Options

switch jffs2 to inode->i_acl 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 05fc0790
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 48 deletions
fs/jffs2/acl.c
View file @ 290c263b
...@@ -158,10 +158,10 @@ static void *jffs2_acl_to_medium(const struct posix_acl *acl, size_t *size) ...@@ -158,10 +158,10 @@ static void *jffs2_acl_to_medium(const struct posix_acl *acl, size_t *size)
static struct posix_acl *jffs2_iget_acl(struct inode *inode, struct posix_acl **i_acl) static struct posix_acl *jffs2_iget_acl(struct inode *inode, struct posix_acl **i_acl)
{ {
struct posix_acl *acl = JFFS2_ACL_NOT_CACHED; struct posix_acl *acl = ACL_NOT_CACHED;
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
if (*i_acl != JFFS2_ACL_NOT_CACHED) if (*i_acl != ACL_NOT_CACHED)
acl = posix_acl_dup(*i_acl); acl = posix_acl_dup(*i_acl);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
return acl; return acl;
...@@ -170,7 +170,7 @@ static struct posix_acl *jffs2_iget_acl(struct inode *inode, struct posix_acl ** ...@@ -170,7 +170,7 @@ static struct posix_acl *jffs2_iget_acl(struct inode *inode, struct posix_acl **
static void jffs2_iset_acl(struct inode *inode, struct posix_acl **i_acl, struct posix_acl *acl) static void jffs2_iset_acl(struct inode *inode, struct posix_acl **i_acl, struct posix_acl *acl)
{ {
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
if (*i_acl != JFFS2_ACL_NOT_CACHED) if (*i_acl != ACL_NOT_CACHED)
posix_acl_release(*i_acl); posix_acl_release(*i_acl);
*i_acl = posix_acl_dup(acl); *i_acl = posix_acl_dup(acl);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
...@@ -178,21 +178,20 @@ static void jffs2_iset_acl(struct inode *inode, struct posix_acl **i_acl, struct ...@@ -178,21 +178,20 @@ static void jffs2_iset_acl(struct inode *inode, struct posix_acl **i_acl, struct
static struct posix_acl *jffs2_get_acl(struct inode *inode, int type) static struct posix_acl *jffs2_get_acl(struct inode *inode, int type)
{ {
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct posix_acl *acl; struct posix_acl *acl;
char *value = NULL; char *value = NULL;
int rc, xprefix; int rc, xprefix;
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
acl = jffs2_iget_acl(inode, &f->i_acl_access); acl = jffs2_iget_acl(inode, &inode->i_acl);
if (acl != JFFS2_ACL_NOT_CACHED) if (acl != ACL_NOT_CACHED)
return acl; return acl;
xprefix = JFFS2_XPREFIX_ACL_ACCESS; xprefix = JFFS2_XPREFIX_ACL_ACCESS;
break; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT:
acl = jffs2_iget_acl(inode, &f->i_acl_default); acl = jffs2_iget_acl(inode, &inode->i_default_acl);
if (acl != JFFS2_ACL_NOT_CACHED) if (acl != ACL_NOT_CACHED)
return acl; return acl;
xprefix = JFFS2_XPREFIX_ACL_DEFAULT; xprefix = JFFS2_XPREFIX_ACL_DEFAULT;
break; break;
...@@ -218,10 +217,10 @@ static struct posix_acl *jffs2_get_acl(struct inode *inode, int type) ...@@ -218,10 +217,10 @@ static struct posix_acl *jffs2_get_acl(struct inode *inode, int type)
if (!IS_ERR(acl)) { if (!IS_ERR(acl)) {
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
jffs2_iset_acl(inode, &f->i_acl_access, acl); jffs2_iset_acl(inode, &inode->i_acl, acl);
break; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT:
jffs2_iset_acl(inode, &f->i_acl_default, acl); jffs2_iset_acl(inode, &inode->i_default_acl, acl);
break; break;
} }
} }
...@@ -249,7 +248,6 @@ static int __jffs2_set_acl(struct inode *inode, int xprefix, struct posix_acl *a ...@@ -249,7 +248,6 @@ static int __jffs2_set_acl(struct inode *inode, int xprefix, struct posix_acl *a
static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl) static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
{ {
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
int rc, xprefix; int rc, xprefix;
if (S_ISLNK(inode->i_mode)) if (S_ISLNK(inode->i_mode))
...@@ -288,10 +286,10 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl) ...@@ -288,10 +286,10 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
if (!rc) { if (!rc) {
switch(type) { switch(type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
jffs2_iset_acl(inode, &f->i_acl_access, acl); jffs2_iset_acl(inode, &inode->i_acl, acl);
break; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT:
jffs2_iset_acl(inode, &f->i_acl_default, acl); jffs2_iset_acl(inode, &inode->i_default_acl, acl);
break; break;
} }
} }
...@@ -321,12 +319,11 @@ int jffs2_permission(struct inode *inode, int mask) ...@@ -321,12 +319,11 @@ int jffs2_permission(struct inode *inode, int mask)
int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
{ {
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct posix_acl *acl, *clone; struct posix_acl *acl, *clone;
int rc; int rc;
f->i_acl_default = NULL; inode->i_default_acl = NULL;
f->i_acl_access = NULL; inode->i_acl = NULL;
if (S_ISLNK(*i_mode)) if (S_ISLNK(*i_mode))
return 0; /* Symlink always has no-ACL */ return 0; /* Symlink always has no-ACL */
...@@ -339,7 +336,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) ...@@ -339,7 +336,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
*i_mode &= ~current_umask(); *i_mode &= ~current_umask();
} else { } else {
if (S_ISDIR(*i_mode)) if (S_ISDIR(*i_mode))
jffs2_iset_acl(inode, &f->i_acl_default, acl); jffs2_iset_acl(inode, &inode->i_default_acl, acl);
clone = posix_acl_clone(acl, GFP_KERNEL); clone = posix_acl_clone(acl, GFP_KERNEL);
if (!clone) if (!clone)
...@@ -350,7 +347,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) ...@@ -350,7 +347,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
return rc; return rc;
} }
if (rc > 0) if (rc > 0)
jffs2_iset_acl(inode, &f->i_acl_access, clone); jffs2_iset_acl(inode, &inode->i_acl, clone);
posix_acl_release(clone); posix_acl_release(clone);
} }
...@@ -359,17 +356,16 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) ...@@ -359,17 +356,16 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
int jffs2_init_acl_post(struct inode *inode) int jffs2_init_acl_post(struct inode *inode)
{ {
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
int rc; int rc;
if (f->i_acl_default) { if (inode->i_default_acl) {
rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_DEFAULT, f->i_acl_default); rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_DEFAULT, inode->i_default_acl);
if (rc) if (rc)
return rc; return rc;
} }
if (f->i_acl_access) { if (inode->i_acl) {
rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_ACCESS, f->i_acl_access); rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_ACCESS, inode->i_acl);
if (rc) if (rc)
return rc; return rc;
} }
...@@ -377,18 +373,6 @@ int jffs2_init_acl_post(struct inode *inode) ...@@ -377,18 +373,6 @@ int jffs2_init_acl_post(struct inode *inode)
return 0; return 0;
} }
void jffs2_clear_acl(struct jffs2_inode_info *f)
{
if (f->i_acl_access && f->i_acl_access != JFFS2_ACL_NOT_CACHED) {
posix_acl_release(f->i_acl_access);
f->i_acl_access = JFFS2_ACL_NOT_CACHED;
}
if (f->i_acl_default && f->i_acl_default != JFFS2_ACL_NOT_CACHED) {
posix_acl_release(f->i_acl_default);
f->i_acl_default = JFFS2_ACL_NOT_CACHED;
}
}
int jffs2_acl_chmod(struct inode *inode) int jffs2_acl_chmod(struct inode *inode)
{ {
struct posix_acl *acl, *clone; struct posix_acl *acl, *clone;
......
fs/jffs2/acl.h
View file @ 290c263b
...@@ -26,13 +26,10 @@ struct jffs2_acl_header { ...@@ -26,13 +26,10 @@ struct jffs2_acl_header {
#ifdef CONFIG_JFFS2_FS_POSIX_ACL #ifdef CONFIG_JFFS2_FS_POSIX_ACL
#define JFFS2_ACL_NOT_CACHED ((void *)-1)
extern int jffs2_permission(struct inode *, int); extern int jffs2_permission(struct inode *, int);
extern int jffs2_acl_chmod(struct inode *); extern int jffs2_acl_chmod(struct inode *);
extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *); extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
extern int jffs2_init_acl_post(struct inode *); extern int jffs2_init_acl_post(struct inode *);
extern void jffs2_clear_acl(struct jffs2_inode_info *);
extern struct xattr_handler jffs2_acl_access_xattr_handler; extern struct xattr_handler jffs2_acl_access_xattr_handler;
extern struct xattr_handler jffs2_acl_default_xattr_handler; extern struct xattr_handler jffs2_acl_default_xattr_handler;
...@@ -43,6 +40,5 @@ extern struct xattr_handler jffs2_acl_default_xattr_handler; ...@@ -43,6 +40,5 @@ extern struct xattr_handler jffs2_acl_default_xattr_handler;
#define jffs2_acl_chmod(inode) (0) #define jffs2_acl_chmod(inode) (0)
#define jffs2_init_acl_pre(dir_i,inode,mode) (0) #define jffs2_init_acl_pre(dir_i,inode,mode) (0)
#define jffs2_init_acl_post(inode) (0) #define jffs2_init_acl_post(inode) (0)
#define jffs2_clear_acl(f)
#endif /* CONFIG_JFFS2_FS_POSIX_ACL */ #endif /* CONFIG_JFFS2_FS_POSIX_ACL */
fs/jffs2/jffs2_fs_i.h
View file @ 290c263b
...@@ -50,10 +50,6 @@ struct jffs2_inode_info { ...@@ -50,10 +50,6 @@ struct jffs2_inode_info {
uint16_t flags; uint16_t flags;
uint8_t usercompr; uint8_t usercompr;
struct inode vfs_inode; struct inode vfs_inode;
#ifdef CONFIG_JFFS2_FS_POSIX_ACL
struct posix_acl *i_acl_access;
struct posix_acl *i_acl_default;
#endif
}; };
#endif /* _JFFS2_FS_I */ #endif /* _JFFS2_FS_I */
fs/jffs2/os-linux.h
View file @ 290c263b
...@@ -56,10 +56,6 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) ...@@ -56,10 +56,6 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)
f->target = NULL; f->target = NULL;
f->flags = 0; f->flags = 0;
f->usercompr = 0; f->usercompr = 0;
#ifdef CONFIG_JFFS2_FS_POSIX_ACL
f->i_acl_access = JFFS2_ACL_NOT_CACHED;
f->i_acl_default = JFFS2_ACL_NOT_CACHED;
#endif
} }
......
fs/jffs2/readinode.c
View file @ 290c263b
...@@ -1424,7 +1424,6 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f) ...@@ -1424,7 +1424,6 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f)
struct jffs2_full_dirent *fd, *fds; struct jffs2_full_dirent *fd, *fds;
int deleted; int deleted;
jffs2_clear_acl(f);
jffs2_xattr_delete_inode(c, f->inocache); jffs2_xattr_delete_inode(c, f->inocache);
mutex_lock(&f->sem); mutex_lock(&f->sem);
deleted = f->inocache && !f->inocache->pino_nlink; deleted = f->inocache && !f->inocache->pino_nlink;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7