Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6582a0e6 authored by Al Viro's avatar Al Viro
Browse files

switch ext3 to inode->i_acl 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5e78b435

fs/ext3/acl.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ ext3_iget_acl(struct inode *inode, struct posix_acl **i_acl) 
	if (acl) {

	if (acl) {

		spin_lock(&inode->i_lock);

		spin_lock(&inode->i_lock);

		acl = *i_acl;

		acl = *i_acl;

		if (acl != EXT3_ACL_NOT_CACHED)

		if (acl != ACL_NOT_CACHED)

			acl = posix_acl_dup(acl);

			acl = posix_acl_dup(acl);

		spin_unlock(&inode->i_lock);

		spin_unlock(&inode->i_lock);

	}

	}
@@ -147,7 +147,7 @@ ext3_iset_acl(struct inode *inode, struct posix_acl **i_acl, 
                  struct posix_acl *acl)

                  struct posix_acl *acl)

{

{

	spin_lock(&inode->i_lock);

	spin_lock(&inode->i_lock);

	if (*i_acl != EXT3_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);
@@ -161,7 +161,6 @@ ext3_iset_acl(struct inode *inode, struct posix_acl **i_acl, 
static struct posix_acl *

static struct posix_acl *

ext3_get_acl(struct inode *inode, int type)

ext3_get_acl(struct inode *inode, int type)

{

{

	struct ext3_inode_info *ei = EXT3_I(inode);

	int name_index;

	int name_index;

	char *value = NULL;

	char *value = NULL;

	struct posix_acl *acl;

	struct posix_acl *acl;
@@ -172,15 +171,15 @@ ext3_get_acl(struct inode *inode, int type) 




	switch(type) {

	switch(type) {

		case ACL_TYPE_ACCESS:

		case ACL_TYPE_ACCESS:

			acl = ext3_iget_acl(inode, &ei->i_acl);

			acl = ext3_iget_acl(inode, &inode->i_acl);

			if (acl != EXT3_ACL_NOT_CACHED)

			if (acl != ACL_NOT_CACHED)

				return acl;

				return acl;

			name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;

			name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;

			break;

			break;





		case ACL_TYPE_DEFAULT:

		case ACL_TYPE_DEFAULT:

			acl = ext3_iget_acl(inode, &ei->i_default_acl);

			acl = ext3_iget_acl(inode, &inode->i_default_acl);

			if (acl != EXT3_ACL_NOT_CACHED)

			if (acl != ACL_NOT_CACHED)

				return acl;

				return acl;

			name_index = EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT;

			name_index = EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT;

			break;

			break;
@@ -206,11 +205,11 @@ ext3_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:

				ext3_iset_acl(inode, &ei->i_acl, acl);

				ext3_iset_acl(inode, &inode->i_acl, acl);

				break;

				break;





			case ACL_TYPE_DEFAULT:

			case ACL_TYPE_DEFAULT:

				ext3_iset_acl(inode, &ei->i_default_acl, acl);

				ext3_iset_acl(inode, &inode->i_default_acl, acl);

				break;

				break;

		}

		}

	}

	}
@@ -226,7 +225,6 @@ static int 
ext3_set_acl(handle_t *handle, struct inode *inode, int type,

ext3_set_acl(handle_t *handle, struct inode *inode, int type,

	     struct posix_acl *acl)

	     struct posix_acl *acl)

{

{

	struct ext3_inode_info *ei = EXT3_I(inode);

	int name_index;

	int name_index;

	void *value = NULL;

	void *value = NULL;

	size_t size = 0;

	size_t size = 0;
@@ -274,11 +272,11 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type, 
	if (!error) {

	if (!error) {

		switch(type) {

		switch(type) {

			case ACL_TYPE_ACCESS:

			case ACL_TYPE_ACCESS:

				ext3_iset_acl(inode, &ei->i_acl, acl);

				ext3_iset_acl(inode, &inode->i_acl, acl);

				break;

				break;





			case ACL_TYPE_DEFAULT:

			case ACL_TYPE_DEFAULT:

				ext3_iset_acl(inode, &ei->i_default_acl, acl);

				ext3_iset_acl(inode, &inode->i_default_acl, acl);

				break;

				break;

		}

		}

	}

	}

fs/ext3/acl.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -53,10 +53,6 @@ static inline int ext3_acl_count(size_t size) 




#ifdef CONFIG_EXT3_FS_POSIX_ACL

#ifdef CONFIG_EXT3_FS_POSIX_ACL





/* Value for inode->u.ext3_i.i_acl and inode->u.ext3_i.i_default_acl

   if the ACL has not been cached */

#define EXT3_ACL_NOT_CACHED ((void *)-1)



/* acl.c */

/* acl.c */

extern int ext3_permission (struct inode *, int);

extern int ext3_permission (struct inode *, int);

extern int ext3_acl_chmod (struct inode *);

extern int ext3_acl_chmod (struct inode *);

fs/ext3/inode.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -2752,10 +2752,6 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino) 
		return inode;

		return inode;





	ei = EXT3_I(inode);

	ei = EXT3_I(inode);

#ifdef CONFIG_EXT3_FS_POSIX_ACL

	ei->i_acl = EXT3_ACL_NOT_CACHED;

	ei->i_default_acl = EXT3_ACL_NOT_CACHED;

#endif

	ei->i_block_alloc_info = NULL;

	ei->i_block_alloc_info = NULL;





	ret = __ext3_get_inode_loc(inode, &iloc, 0);

	ret = __ext3_get_inode_loc(inode, &iloc, 0);

fs/ext3/super.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -464,10 +464,6 @@ static struct inode *ext3_alloc_inode(struct super_block *sb) 
	ei = kmem_cache_alloc(ext3_inode_cachep, GFP_NOFS);

	ei = kmem_cache_alloc(ext3_inode_cachep, GFP_NOFS);

	if (!ei)

	if (!ei)

		return NULL;

		return NULL;

#ifdef CONFIG_EXT3_FS_POSIX_ACL

	ei->i_acl = EXT3_ACL_NOT_CACHED;

	ei->i_default_acl = EXT3_ACL_NOT_CACHED;

#endif

	ei->i_block_alloc_info = NULL;

	ei->i_block_alloc_info = NULL;

	ei->vfs_inode.i_version = 1;

	ei->vfs_inode.i_version = 1;

	return &ei->vfs_inode;

	return &ei->vfs_inode;
@@ -518,18 +514,6 @@ static void destroy_inodecache(void) 
static void ext3_clear_inode(struct inode *inode)

static void ext3_clear_inode(struct inode *inode)

{

{

	struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info;

	struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info;

#ifdef CONFIG_EXT3_FS_POSIX_ACL

	if (EXT3_I(inode)->i_acl &&

			EXT3_I(inode)->i_acl != EXT3_ACL_NOT_CACHED) {

		posix_acl_release(EXT3_I(inode)->i_acl);

		EXT3_I(inode)->i_acl = EXT3_ACL_NOT_CACHED;

	}

	if (EXT3_I(inode)->i_default_acl &&

			EXT3_I(inode)->i_default_acl != EXT3_ACL_NOT_CACHED) {

		posix_acl_release(EXT3_I(inode)->i_default_acl);

		EXT3_I(inode)->i_default_acl = EXT3_ACL_NOT_CACHED;

	}

#endif

	ext3_discard_reservation(inode);

	ext3_discard_reservation(inode);

	EXT3_I(inode)->i_block_alloc_info = NULL;

	EXT3_I(inode)->i_block_alloc_info = NULL;

	if (unlikely(rsv))

	if (unlikely(rsv))

include/linux/ext3_fs_i.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -103,10 +103,6 @@ struct ext3_inode_info { 
	 */

	 */

	struct rw_semaphore xattr_sem;

	struct rw_semaphore xattr_sem;

#endif

#endif

#ifdef CONFIG_EXT3_FS_POSIX_ACL

	struct posix_acl	*i_acl;

	struct posix_acl	*i_default_acl;

#endif





	struct list_head i_orphan;	/* unlinked but open inodes */

	struct list_head i_orphan;	/* unlinked but open inodes */