public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Miklos Szeredi <miklos@szeredi•hu>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	zhangliguang <zhangliguang@linux•alibaba.com>
Subject: linux-next: manual merge of the vfs tree with the fuse tree
Date: Tue, 7 May 2019 09:53:23 +1000	[thread overview]
Message-ID: <20190507095323.4ec2d3f7@canb.auug.org.au> (raw)

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

Hi all,

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

  fs/fuse/inode.c

between commit:

  829f949b6e06 ("fuse: clean up fuse_alloc_inode")

from the fuse tree and commit:

  9baf28bbfea1 ("fuse: switch to ->free_inode()")

from the vfs 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/fuse/inode.c
index bc02bad1be7c,f485d09d14df..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -102,25 -104,16 +102,16 @@@ static struct inode *fuse_alloc_inode(s
  		return NULL;
  	}
  
 -	return inode;
 +	return &fi->inode;
  }
  
- static void fuse_i_callback(struct rcu_head *head)
- {
- 	struct inode *inode = container_of(head, struct inode, i_rcu);
- 	kmem_cache_free(fuse_inode_cachep, get_fuse_inode(inode));
- }
- 
- static void fuse_destroy_inode(struct inode *inode)
+ static void fuse_free_inode(struct inode *inode)
  {
  	struct fuse_inode *fi = get_fuse_inode(inode);
- 	if (S_ISREG(inode->i_mode) && !is_bad_inode(inode)) {
- 		WARN_ON(!list_empty(&fi->write_files));
- 		WARN_ON(!list_empty(&fi->queued_writes));
- 	}
+ 
  	mutex_destroy(&fi->mutex);
  	kfree(fi->forget);
- 	call_rcu(&inode->i_rcu, fuse_i_callback);
+ 	kmem_cache_free(fuse_inode_cachep, fi);
  }
  
  static void fuse_evict_inode(struct inode *inode)

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

next             reply	other threads:[~2019-05-06 23:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-06 23:53 Stephen Rothwell [this message]
2019-05-08  1:01 ` linux-next: manual merge of the vfs tree with the fuse tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-08-30  3:01 Stephen Rothwell
2019-09-02  9:00 ` Miklos Szeredi
2019-09-02 15:10   ` Miklos Szeredi
2019-09-02 15:30     ` Al Viro
2019-09-02 23:23       ` Stephen Rothwell
2019-09-02 23:29         ` Al Viro
2020-02-06 22:14 Stephen Rothwell
2025-01-23 22:16 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190507095323.4ec2d3f7@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=miklos@szeredi$(echo .)hu \
    --cc=viro@ZenIV$(echo .)linux.org.uk \
    --cc=zhangliguang@linux$(echo .)alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox