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

[Stephen Rothwell]

Hi all,

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

  fs/btrfs/inode.c

between commit:

  abe3bf7425fb ("btrfs: fix an error handling path in btrfs_rename()")

from Linus' tree and commit:

  7ddfa7d0d7d1 ("fs: port inode_init_owner() to mnt_idmap")

from the vfs-idmapping 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/btrfs/inode.c
index 98a800b8bd43,8d74d042c626..000000000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -9376,11 -9376,9 +9376,11 @@@ static int btrfs_rename(struct mnt_idma
  		filemap_flush(old_inode->i_mapping);
  
  	if (flags & RENAME_WHITEOUT) {
- 		whiteout_args.inode = new_whiteout_inode(mnt_userns, old_dir);
+ 		whiteout_args.inode = new_whiteout_inode(idmap, old_dir);
 -		if (!whiteout_args.inode)
 -			return -ENOMEM;
 +		if (!whiteout_args.inode) {
 +			ret = -ENOMEM;
 +			goto out_fscrypt_names;
 +		}
  		ret = btrfs_new_inode_prepare(&whiteout_args, &trans_num_items);
  		if (ret)
  			goto out_whiteout_inode;

Attachment: pgpZPWJj_k6g3.pgp
Description: OpenPGP digital signature