Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 154131
b: refs/heads/master
c: 290c263
h: refs/heads/master
i:
  154129: b283a49
  154127: 55cacc3
v: v3
  • Loading branch information
Al Viro committed Jun 24, 2009
1 parent b91e45a commit 76181d6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 49 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 05fc0790b6c9c611129f2f712d00b6a8a364e8d2
refs/heads/master: 290c263bf83cd78e53b1aa3b42165f588163f2be
54 changes: 19 additions & 35 deletions trunk/fs/jffs2/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct posix_acl *acl = JFFS2_ACL_NOT_CACHED;
struct posix_acl *acl = ACL_NOT_CACHED;

spin_lock(&inode->i_lock);
if (*i_acl != JFFS2_ACL_NOT_CACHED)
if (*i_acl != ACL_NOT_CACHED)
acl = posix_acl_dup(*i_acl);
spin_unlock(&inode->i_lock);
return acl;
Expand All @@ -170,29 +170,28 @@ 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)
{
spin_lock(&inode->i_lock);
if (*i_acl != JFFS2_ACL_NOT_CACHED)
if (*i_acl != ACL_NOT_CACHED)
posix_acl_release(*i_acl);
*i_acl = posix_acl_dup(acl);
spin_unlock(&inode->i_lock);
}

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;
char *value = NULL;
int rc, xprefix;

switch (type) {
case ACL_TYPE_ACCESS:
acl = jffs2_iget_acl(inode, &f->i_acl_access);
if (acl != JFFS2_ACL_NOT_CACHED)
acl = jffs2_iget_acl(inode, &inode->i_acl);
if (acl != ACL_NOT_CACHED)
return acl;
xprefix = JFFS2_XPREFIX_ACL_ACCESS;
break;
case ACL_TYPE_DEFAULT:
acl = jffs2_iget_acl(inode, &f->i_acl_default);
if (acl != JFFS2_ACL_NOT_CACHED)
acl = jffs2_iget_acl(inode, &inode->i_default_acl);
if (acl != ACL_NOT_CACHED)
return acl;
xprefix = JFFS2_XPREFIX_ACL_DEFAULT;
break;
Expand All @@ -218,10 +217,10 @@ static struct posix_acl *jffs2_get_acl(struct inode *inode, int type)
if (!IS_ERR(acl)) {
switch (type) {
case ACL_TYPE_ACCESS:
jffs2_iset_acl(inode, &f->i_acl_access, acl);
jffs2_iset_acl(inode, &inode->i_acl, acl);
break;
case ACL_TYPE_DEFAULT:
jffs2_iset_acl(inode, &f->i_acl_default, acl);
jffs2_iset_acl(inode, &inode->i_default_acl, acl);
break;
}
}
Expand Down Expand Up @@ -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)
{
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
int rc, xprefix;

if (S_ISLNK(inode->i_mode))
Expand Down Expand Up @@ -288,10 +286,10 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
if (!rc) {
switch(type) {
case ACL_TYPE_ACCESS:
jffs2_iset_acl(inode, &f->i_acl_access, acl);
jffs2_iset_acl(inode, &inode->i_acl, acl);
break;
case ACL_TYPE_DEFAULT:
jffs2_iset_acl(inode, &f->i_acl_default, acl);
jffs2_iset_acl(inode, &inode->i_default_acl, acl);
break;
}
}
Expand Down Expand Up @@ -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)
{
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct posix_acl *acl, *clone;
int rc;

f->i_acl_default = NULL;
f->i_acl_access = NULL;
inode->i_default_acl = NULL;
inode->i_acl = NULL;

if (S_ISLNK(*i_mode))
return 0; /* Symlink always has no-ACL */
Expand All @@ -339,7 +336,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
*i_mode &= ~current_umask();
} else {
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);
if (!clone)
Expand All @@ -350,7 +347,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
return rc;
}
if (rc > 0)
jffs2_iset_acl(inode, &f->i_acl_access, clone);
jffs2_iset_acl(inode, &inode->i_acl, clone);

posix_acl_release(clone);
}
Expand All @@ -359,36 +356,23 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)

int jffs2_init_acl_post(struct inode *inode)
{
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
int rc;

if (f->i_acl_default) {
rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_DEFAULT, f->i_acl_default);
if (inode->i_default_acl) {
rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_DEFAULT, inode->i_default_acl);
if (rc)
return rc;
}

if (f->i_acl_access) {
rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_ACCESS, f->i_acl_access);
if (inode->i_acl) {
rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_ACCESS, inode->i_acl);
if (rc)
return rc;
}

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)
{
struct posix_acl *acl, *clone;
Expand Down
4 changes: 0 additions & 4 deletions trunk/fs/jffs2/acl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@ struct jffs2_acl_header {

#ifdef CONFIG_JFFS2_FS_POSIX_ACL

#define JFFS2_ACL_NOT_CACHED ((void *)-1)

extern int jffs2_permission(struct inode *, int);
extern int jffs2_acl_chmod(struct inode *);
extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
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_default_xattr_handler;
Expand All @@ -43,6 +40,5 @@ extern struct xattr_handler jffs2_acl_default_xattr_handler;
#define jffs2_acl_chmod(inode) (0)
#define jffs2_init_acl_pre(dir_i,inode,mode) (0)
#define jffs2_init_acl_post(inode) (0)
#define jffs2_clear_acl(f)

#endif /* CONFIG_JFFS2_FS_POSIX_ACL */
4 changes: 0 additions & 4 deletions trunk/fs/jffs2/jffs2_fs_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ struct jffs2_inode_info {
uint16_t flags;
uint8_t usercompr;
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 */
4 changes: 0 additions & 4 deletions trunk/fs/jffs2/os-linux.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)
f->target = NULL;
f->flags = 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
}


Expand Down
1 change: 0 additions & 1 deletion trunk/fs/jffs2/readinode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
int deleted;

jffs2_clear_acl(f);
jffs2_xattr_delete_inode(c, f->inocache);
mutex_lock(&f->sem);
deleted = f->inocache && !f->inocache->pino_nlink;
Expand Down

0 comments on commit 76181d6

Please sign in to comment.