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

Commit ba5a2655 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull remaining vfs xattr work from Al Viro:
 "The rest of work.xattr (non-cifs conversions)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  btrfs: Switch to generic xattr handlers
  ubifs: Switch to generic xattr handlers
  jfs: Switch to generic xattr handlers
  jfs: Clean up xattr name mapping
  gfs2: Switch to generic xattr handlers
  ceph: kill __ceph_removexattr()
  ceph: Switch to generic xattr handlers
  ceph: Get rid of d_find_alias in ceph_set_acl
parents 8908c94d e0d46f5c

fs/btrfs/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -10160,10 +10160,10 @@ static const struct inode_operations btrfs_dir_inode_operations = { 
	.symlink	= btrfs_symlink,

	.setattr	= btrfs_setattr,

	.mknod		= btrfs_mknod,

	.setxattr	= btrfs_setxattr,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.removexattr	= generic_removexattr,

	.permission	= btrfs_permission,

	.get_acl	= btrfs_get_acl,

	.set_acl	= btrfs_set_acl,
@@ -10237,10 +10237,10 @@ static const struct address_space_operations btrfs_symlink_aops = { 
static const struct inode_operations btrfs_file_inode_operations = {

	.getattr	= btrfs_getattr,

	.setattr	= btrfs_setattr,

	.setxattr	= btrfs_setxattr,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.listxattr      = btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.removexattr	= generic_removexattr,

	.permission	= btrfs_permission,

	.fiemap		= btrfs_fiemap,

	.get_acl	= btrfs_get_acl,
@@ -10251,10 +10251,10 @@ static const struct inode_operations btrfs_special_inode_operations = { 
	.getattr	= btrfs_getattr,

	.setattr	= btrfs_setattr,

	.permission	= btrfs_permission,

	.setxattr	= btrfs_setxattr,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.removexattr	= generic_removexattr,

	.get_acl	= btrfs_get_acl,

	.set_acl	= btrfs_set_acl,

	.update_time	= btrfs_update_time,
@@ -10265,10 +10265,10 @@ static const struct inode_operations btrfs_symlink_inode_operations = { 
	.getattr	= btrfs_getattr,

	.setattr	= btrfs_setattr,

	.permission	= btrfs_permission,

	.setxattr	= btrfs_setxattr,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.removexattr	= generic_removexattr,

	.update_time	= btrfs_update_time,

};

fs/btrfs/xattr.c

+3 −19
Original line number Diff line number Diff line
@@ -237,6 +237,9 @@ int __btrfs_setxattr(struct btrfs_trans_handle *trans, 
	struct btrfs_root *root = BTRFS_I(inode)->root;

	int ret;



	if (btrfs_root_readonly(root))

		return -EROFS;



	if (trans)

		return do_setxattr(trans, inode, name, value, size, flags);
@@ -432,25 +435,6 @@ const struct xattr_handler *btrfs_xattr_handlers[] = { 
	NULL,

};



int btrfs_setxattr(struct dentry *dentry, const char *name, const void *value,

		   size_t size, int flags)

{

	struct btrfs_root *root = BTRFS_I(d_inode(dentry))->root;



	if (btrfs_root_readonly(root))

		return -EROFS;

	return generic_setxattr(dentry, name, value, size, flags);

}



int btrfs_removexattr(struct dentry *dentry, const char *name)

{

	struct btrfs_root *root = BTRFS_I(d_inode(dentry))->root;



	if (btrfs_root_readonly(root))

		return -EROFS;

	return generic_removexattr(dentry, name);

}



static int btrfs_initxattrs(struct inode *inode,

			    const struct xattr *xattr_array, void *fs_info)

{

fs/btrfs/xattr.h

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ extern ssize_t __btrfs_getxattr(struct inode *inode, const char *name, 
extern int __btrfs_setxattr(struct btrfs_trans_handle *trans,

			    struct inode *inode, const char *name,

			    const void *value, size_t size, int flags);

extern int btrfs_setxattr(struct dentry *dentry, const char *name,

		const void *value, size_t size, int flags);

extern int btrfs_removexattr(struct dentry *dentry, const char *name);



extern int btrfs_xattr_security_init(struct btrfs_trans_handle *trans,

				     struct inode *inode, struct inode *dir,

fs/ceph/acl.c

+5 −9
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	char *value = NULL;

	struct iattr newattrs;

	umode_t new_mode = inode->i_mode, old_mode = inode->i_mode;

	struct dentry *dentry;



	switch (type) {

	case ACL_TYPE_ACCESS:
@@ -128,29 +127,26 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
			goto out_free;

	}



	dentry = d_find_alias(inode);

	if (new_mode != old_mode) {

		newattrs.ia_mode = new_mode;

		newattrs.ia_valid = ATTR_MODE;

		ret = ceph_setattr(dentry, &newattrs);

		ret = __ceph_setattr(inode, &newattrs);

		if (ret)

			goto out_dput;

			goto out_free;

	}



	ret = __ceph_setxattr(dentry, name, value, size, 0);

	ret = __ceph_setxattr(inode, name, value, size, 0);

	if (ret) {

		if (new_mode != old_mode) {

			newattrs.ia_mode = old_mode;

			newattrs.ia_valid = ATTR_MODE;

			ceph_setattr(dentry, &newattrs);

			__ceph_setattr(inode, &newattrs);

		}

		goto out_dput;

		goto out_free;

	}



	ceph_set_cached_acl(inode, type, acl);



out_dput:

	dput(dentry);

out_free:

	kfree(value);

out:

fs/ceph/dir.c

+4 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/namei.h>

#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/xattr.h>



#include "super.h"

#include "mds_client.h"
@@ -1342,10 +1343,10 @@ const struct inode_operations ceph_dir_iops = { 
	.permission = ceph_permission,

	.getattr = ceph_getattr,

	.setattr = ceph_setattr,

	.setxattr = ceph_setxattr,

	.getxattr = ceph_getxattr,

	.setxattr = generic_setxattr,

	.getxattr = generic_getxattr,

	.listxattr = ceph_listxattr,

	.removexattr = ceph_removexattr,

	.removexattr = generic_removexattr,

	.get_acl = ceph_get_acl,

	.set_acl = ceph_set_acl,

	.mknod = ceph_mknod,