linux-next: manual merge of the block tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  fs/xattr.c

between commit:

  705191b03d50 ("fs: fix acl translation")

from Linus' tree and commits:

  f8b398dcacfe ("fs: split off setxattr_copy and do_setxattr function from setxattr")
  8997d04977f5 ("fs: split off do_getxattr from getxattr")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/xattr.c
index 998045165916,0b9f296a7071..000000000000
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@@ -557,26 -556,60 +556,61 @@@ int setxattr_copy(const char __user *na
  	if (error < 0)
  		return error;
  
- 	if (size) {
- 		if (size > XATTR_SIZE_MAX)
+ 	error = 0;
+ 	if (ctx->size) {
+ 		if (ctx->size > XATTR_SIZE_MAX)
  			return -E2BIG;
- 		kvalue = kvmalloc(size, GFP_KERNEL);
- 		if (!kvalue)
- 			return -ENOMEM;
- 		if (copy_from_user(kvalue, value, size)) {
- 			error = -EFAULT;
- 			goto out;
+ 
+ 		ctx->kvalue = vmemdup_user(ctx->cvalue, ctx->size);
+ 		if (IS_ERR(ctx->kvalue)) {
+ 			error = PTR_ERR(ctx->kvalue);
+ 			ctx->kvalue = NULL;
  		}
- 		if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
- 		    (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
- 			posix_acl_fix_xattr_from_user(mnt_userns, d_inode(d),
- 						      kvalue, size);
  	}
  
- 	error = vfs_setxattr(mnt_userns, d, kname, kvalue, size, flags);
- out:
- 	kvfree(kvalue);
+ 	return error;
+ }
+ 
+ static void setxattr_convert(struct user_namespace *mnt_userns,
 -			struct xattr_ctx *ctx)
++			struct dentry *d, struct xattr_ctx *ctx)
+ {
+ 	if (ctx->size &&
+ 		((strcmp(ctx->kname->name, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
+ 		(strcmp(ctx->kname->name, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)))
 -		posix_acl_fix_xattr_from_user(mnt_userns, ctx->kvalue, ctx->size);
++		posix_acl_fix_xattr_from_user(mnt_userns, d_inode(d),
++					      ctx->kvalue, ctx->size);
+ }
+ 
+ int do_setxattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+ 		struct xattr_ctx *ctx)
+ {
 -	setxattr_convert(mnt_userns, ctx);
++	setxattr_convert(mnt_userns, dentry, ctx);
+ 	return vfs_setxattr(mnt_userns, dentry, ctx->kname->name,
+ 			ctx->kvalue, ctx->size, ctx->flags);
+ }
+ 
+ static long
+ setxattr(struct user_namespace *mnt_userns, struct dentry *d,
+ 	const char __user *name, const void __user *value, size_t size,
+ 	int flags)
+ {
+ 	struct xattr_name kname;
+ 	struct xattr_ctx ctx = {
+ 		.cvalue   = value,
+ 		.kvalue   = NULL,
+ 		.size     = size,
+ 		.kname    = &kname,
+ 		.flags    = flags,
+ 	};
+ 	int error;
  
+ 	error = setxattr_copy(name, &ctx);
+ 	if (error)
+ 		return error;
+ 
+ 	error = do_setxattr(mnt_userns, d, &ctx);
+ 
+ 	kvfree(ctx.kvalue);
  	return error;
  }
  
@@@ -668,11 -694,10 +695,11 @@@ do_getxattr(struct user_namespace *mnt_
  	if (error > 0) {
  		if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
  		    (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
 -			posix_acl_fix_xattr_to_user(mnt_userns, ctx->kvalue, error);
 +			posix_acl_fix_xattr_to_user(mnt_userns, d_inode(d),
- 						    kvalue, error);
- 		if (size && copy_to_user(value, kvalue, error))
++						    ctx->kvalue, error);
+ 		if (ctx->size && copy_to_user(ctx->value, ctx->kvalue, error))
  			error = -EFAULT;
- 	} else if (error == -ERANGE && size >= XATTR_SIZE_MAX) {
+ 	} else if (error == -ERANGE && ctx->size >= XATTR_SIZE_MAX) {
  		/* The file system tried to returned a value bigger
  		   than XATTR_SIZE_MAX bytes. Not possible. */
  		error = -E2BIG;

Attachment: pgpCsGG0Bidwf.pgp
Description: OpenPGP digital signature