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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

Hi all,

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

  fs/fuse/inode.c

between commit:

  053fc4f755ad ("fuse: fix UAF in rcu pathwalks")

from Linus' tree and commit:

  44350256ab94 ("fuse: implement ioctls to manage backing files")

from the fuse tree.

I fixed it up (I think? 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/fuse/inode.c
index 516ea2979a90,02869edf72f3..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -930,14 -942,6 +942,16 @@@ void fuse_conn_init(struct fuse_conn *f
  }
  EXPORT_SYMBOL_GPL(fuse_conn_init);
  
 +static void delayed_release(struct rcu_head *p)
 +{
 +	struct fuse_conn *fc = container_of(p, struct fuse_conn, rcu);
 +
 +	put_user_ns(fc->user_ns);
++	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))
++		fuse_backing_files_free(fc);
 +	fc->release(fc);
 +}
 +
  void fuse_conn_put(struct fuse_conn *fc)
  {
  	if (refcount_dec_and_test(&fc->count)) {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]