Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the vfs tree with the fuse tree
@ 2020-02-06 22:14 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-02-06 22:14 UTC (permalink / raw)
  To: Al Viro, Miklos Szeredi
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, zhengbin

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

Hi all,

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

  fs/fuse/inode.c

between commit:

  cabdb4fa2f66 ("fuse: use true,false for bool variable")

from the fuse tree and commit:

  76c50219b279 ("fuse: switch to use errorfc() et.al.")

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 77fef29ebe4f,557611dc2d46..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -499,23 -494,23 +494,23 @@@ static int fuse_parse_param(struct fs_c
  
  	case OPT_ROOTMODE:
  		if (!fuse_valid_type(result.uint_32))
- 			return invalf(fc, "fuse: Invalid rootmode");
+ 			return invalfc(fc, "Invalid rootmode");
  		ctx->rootmode = result.uint_32;
 -		ctx->rootmode_present = 1;
 +		ctx->rootmode_present = true;
  		break;
  
  	case OPT_USER_ID:
  		ctx->user_id = make_kuid(fc->user_ns, result.uint_32);
  		if (!uid_valid(ctx->user_id))
- 			return invalf(fc, "fuse: Invalid user_id");
+ 			return invalfc(fc, "Invalid user_id");
 -		ctx->user_id_present = 1;
 +		ctx->user_id_present = true;
  		break;
  
  	case OPT_GROUP_ID:
  		ctx->group_id = make_kgid(fc->user_ns, result.uint_32);
  		if (!gid_valid(ctx->group_id))
- 			return invalf(fc, "fuse: Invalid group_id");
+ 			return invalfc(fc, "Invalid group_id");
 -		ctx->group_id_present = 1;
 +		ctx->group_id_present = true;
  		break;
  
  	case OPT_DEFAULT_PERMISSIONS:

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the vfs tree with the fuse tree
  2019-09-02 23:23       ` Stephen Rothwell
@ 2019-09-02 23:29         ` Al Viro
  0 siblings, 0 replies; 9+ messages in thread
From: Al Viro @ 2019-09-02 23:29 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Miklos Szeredi, David Howells, Linux Next Mailing List,
	Linux Kernel Mailing List, Stefan Hajnoczi

On Tue, Sep 03, 2019 at 09:23:17AM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> On Mon, 2 Sep 2019 16:30:04 +0100 Al Viro <viro@zeniv.linux.org.uk> wrote:
> >
> > ... originals cheerfully dropped; will be gone in today's push to
> > vfs.git#for-next.
> 
> Not pushed out yet?

Give me about fifteen minutes...

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the vfs tree with the fuse tree
  2019-09-02 15:30     ` Al Viro
@ 2019-09-02 23:23       ` Stephen Rothwell
  2019-09-02 23:29         ` Al Viro
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2019-09-02 23:23 UTC (permalink / raw)
  To: Al Viro
  Cc: Miklos Szeredi, David Howells, Linux Next Mailing List,
	Linux Kernel Mailing List, Stefan Hajnoczi

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

Hi Al,

On Mon, 2 Sep 2019 16:30:04 +0100 Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> ... originals cheerfully dropped; will be gone in today's push to
> vfs.git#for-next.

Not pushed out yet?

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the vfs tree with the fuse tree
  2019-09-02 15:10   ` Miklos Szeredi
@ 2019-09-02 15:30     ` Al Viro
  2019-09-02 23:23       ` Stephen Rothwell
  0 siblings, 1 reply; 9+ messages in thread
From: Al Viro @ 2019-09-02 15:30 UTC (permalink / raw)
  To: Miklos Szeredi
  Cc: David Howells, Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Stefan Hajnoczi

On Mon, Sep 02, 2019 at 05:10:27PM +0200, Miklos Szeredi wrote:
> On Mon, Sep 2, 2019 at 11:00 AM Miklos Szeredi <miklos@szeredi.hu> wrote:
> >
> > On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > >
> > > Today's linux-next merge of the vfs tree got a conflict in:
> > >
> > >   fs/fuse/inode.c
> > >
> > > between commit:
> > >
> > >   1458e5e9f99a ("fuse: extract fuse_fill_super_common()")
> > >
> > > from the fuse tree and commit:
> > >
> > >   2ad9ab0f7429 ("vfs: Convert fuse to use the new mount API")
> > >   48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")
> >
> > And the latter is b0rked anyway.
> 
> Both, actually.
> 
> Pushed fixed ones to fuse.git#for-next.

... originals cheerfully dropped; will be gone in today's push to
vfs.git#for-next.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the vfs tree with the fuse tree
  2019-09-02  9:00 ` Miklos Szeredi
@ 2019-09-02 15:10   ` Miklos Szeredi
  2019-09-02 15:30     ` Al Viro
  0 siblings, 1 reply; 9+ messages in thread
From: Miklos Szeredi @ 2019-09-02 15:10 UTC (permalink / raw)
  To: Al Viro, David Howells
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Stefan Hajnoczi

On Mon, Sep 2, 2019 at 11:00 AM Miklos Szeredi <miklos@szeredi.hu> wrote:
>
> On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the vfs tree got a conflict in:
> >
> >   fs/fuse/inode.c
> >
> > between commit:
> >
> >   1458e5e9f99a ("fuse: extract fuse_fill_super_common()")
> >
> > from the fuse tree and commit:
> >
> >   2ad9ab0f7429 ("vfs: Convert fuse to use the new mount API")
> >   48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")
>
> And the latter is b0rked anyway.

Both, actually.

Pushed fixed ones to fuse.git#for-next.

Thanks,
Miklos

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the vfs tree with the fuse tree
  2019-08-30  3:01 Stephen Rothwell
@ 2019-09-02  9:00 ` Miklos Szeredi
  2019-09-02 15:10   ` Miklos Szeredi
  0 siblings, 1 reply; 9+ messages in thread
From: Miklos Szeredi @ 2019-09-02  9:00 UTC (permalink / raw)
  To: Al Viro
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Stefan Hajnoczi, David Howells

On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
>   fs/fuse/inode.c
>
> between commit:
>
>   1458e5e9f99a ("fuse: extract fuse_fill_super_common()")
>
> from the fuse tree and commit:
>
>   2ad9ab0f7429 ("vfs: Convert fuse to use the new mount API")
>   48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")

And the latter is b0rked anyway.

Al, please drop these patches from the VFS queue, I'll take (and fix)
them through the fuse queue.

Thanks,
Miklos

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the vfs tree with the fuse tree
@ 2019-08-30  3:01 Stephen Rothwell
  2019-09-02  9:00 ` Miklos Szeredi
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2019-08-30  3:01 UTC (permalink / raw)
  To: Al Viro, Miklos Szeredi
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Stefan Hajnoczi, David Howells

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

Hi all,

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

  fs/fuse/inode.c

between commit:

  1458e5e9f99a ("fuse: extract fuse_fill_super_common()")

from the fuse tree and commit:

  2ad9ab0f7429 ("vfs: Convert fuse to use the new mount API")
  48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")

from the vfs tree.

This is too much to work out, so I have effectively reverted the 2 vfs
tree commits.

I fixed it up (see above) 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

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the vfs tree with the fuse tree
  2019-05-06 23:53 Stephen Rothwell
@ 2019-05-08  1:01 ` Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-05-08  1:01 UTC (permalink / raw)
  To: Al Viro, Miklos Szeredi
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, zhangliguang

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

Hi all,

On Tue, 7 May 2019 09:53:23 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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)

This is now a conflict between the fuse tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the vfs tree with the fuse tree
@ 2019-05-06 23:53 Stephen Rothwell
  2019-05-08  1:01 ` Stephen Rothwell
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2019-05-06 23:53 UTC (permalink / raw)
  To: Al Viro, Miklos Szeredi
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, zhangliguang

[-- 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 --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, back to index

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-06 22:14 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
2019-05-06 23:53 Stephen Rothwell
2019-05-08  1:01 ` Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git