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

Commit 2cc6a5a0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

jfs: use generic posix ACL infrastructure 



Copy the scheme I introduced to btrfs many years ago to only use the
xattr handler for ACLs, but pass plain attrs straight through.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2401dc29

fs/jfs/acl.c

+42 −63
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct posix_acl *jfs_get_acl(struct inode *inode, int type) 
	return acl;

}



static int jfs_set_acl(tid_t tid, struct inode *inode, int type,

static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,

		       struct posix_acl *acl)

{

	char *ea_name;
@@ -80,21 +80,22 @@ static int jfs_set_acl(tid_t tid, struct inode *inode, int type, 
	int size = 0;

	char *value = NULL;



	if (S_ISLNK(inode->i_mode))

		return -EOPNOTSUPP;



	switch (type) {

	case ACL_TYPE_ACCESS:

		ea_name = POSIX_ACL_XATTR_ACCESS;

		rc = posix_acl_equiv_mode(acl, &inode->i_mode);

		if (rc < 0)

			return rc;

		if (rc == 0)

			acl = NULL;

		break;

	case ACL_TYPE_DEFAULT:

		ea_name = POSIX_ACL_XATTR_DEFAULT;

			if (!S_ISDIR(inode->i_mode))

				return acl ? -EACCES : 0;

		break;

	default:

		return -EINVAL;

	}



	if (acl) {

		size = posix_acl_xattr_size(acl->a_count);

		value = kmalloc(size, GFP_KERNEL);
@@ -114,65 +115,43 @@ out: 
	return rc;

}



int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)

{

	struct posix_acl *acl = NULL;

	int rc = 0;



	if (S_ISLNK(inode->i_mode))

		return 0;



	acl = jfs_get_acl(dir, ACL_TYPE_DEFAULT);

	if (IS_ERR(acl))

		return PTR_ERR(acl);



	if (acl) {

		if (S_ISDIR(inode->i_mode)) {

			rc = jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, acl);

			if (rc)

				goto cleanup;

		}

		rc = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);

		if (rc < 0)

			goto cleanup; /* posix_acl_release(NULL) is no-op */

		if (rc > 0)

			rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);

cleanup:

		posix_acl_release(acl);

	} else

		inode->i_mode &= ~current_umask();



	JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |

			       inode->i_mode;



	return rc;

}



int jfs_acl_chmod(struct inode *inode)

int jfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)

{

	struct posix_acl *acl;

	int rc;

	tid_t tid;



	if (S_ISLNK(inode->i_mode))

		return -EOPNOTSUPP;



	acl = jfs_get_acl(inode, ACL_TYPE_ACCESS);

	if (IS_ERR(acl) || !acl)

		return PTR_ERR(acl);



	rc = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);

	if (rc)

		return rc;



	tid = txBegin(inode->i_sb, 0);

	mutex_lock(&JFS_IP(inode)->commit_mutex);

	rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);

	rc = __jfs_set_acl(tid, inode, type, acl);

	if (!rc)

		rc = txCommit(tid, 1, &inode, 0);

	txEnd(tid);

	mutex_unlock(&JFS_IP(inode)->commit_mutex);

	return rc;

}



int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)

{

	struct posix_acl *default_acl, *acl;

	int rc = 0;



	rc = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);

	if (rc)

		return rc;



	if (default_acl) {

		rc = __jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, default_acl);

		posix_acl_release(default_acl);

	}



	if (acl) {

		if (!rc)

			rc = __jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);

		posix_acl_release(acl);

	}



	JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |

			       inode->i_mode;



	return rc;

}

fs/jfs/file.c

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/posix_acl.h>

#include <linux/quotaops.h>

#include "jfs_incore.h"

#include "jfs_inode.h"
@@ -131,7 +132,7 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr) 
	mark_inode_dirty(inode);



	if (iattr->ia_valid & ATTR_MODE)

		rc = jfs_acl_chmod(inode);

		rc = posix_acl_chmod(inode, inode->i_mode);

	return rc;

}
@@ -143,6 +144,7 @@ const struct inode_operations jfs_file_inode_operations = { 
	.setattr	= jfs_setattr,

#ifdef CONFIG_JFS_POSIX_ACL

	.get_acl	= jfs_get_acl,

	.set_acl	= jfs_set_acl,

#endif

};

fs/jfs/jfs_acl.h

+1 −6
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#ifdef CONFIG_JFS_POSIX_ACL



struct posix_acl *jfs_get_acl(struct inode *inode, int type);

int jfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);

int jfs_init_acl(tid_t, struct inode *, struct inode *);

int jfs_acl_chmod(struct inode *inode);



#else
@@ -32,10 +32,5 @@ static inline int jfs_init_acl(tid_t tid, struct inode *inode, 
	return 0;

}



static inline int jfs_acl_chmod(struct inode *inode)

{

	return 0;

}



#endif

#endif		/* _H_JFS_ACL */

fs/jfs/jfs_xattr.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t); 
extern ssize_t jfs_listxattr(struct dentry *, char *, size_t);

extern int jfs_removexattr(struct dentry *, const char *);



extern const struct xattr_handler *jfs_xattr_handlers[];



#ifdef CONFIG_JFS_SECURITY

extern int jfs_init_security(tid_t, struct inode *, struct inode *,

			     const struct qstr *);

fs/jfs/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ const struct inode_operations jfs_dir_inode_operations = { 
	.setattr	= jfs_setattr,

#ifdef CONFIG_JFS_POSIX_ACL

	.get_acl	= jfs_get_acl,

	.set_acl	= jfs_set_acl,

#endif

};