linux-next: manual merge of the cifs tree with the fscache tree

linux-next: manual merge of the cifs tree with the fscache tree

[broonie]

Hi all,

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

  fs/cifs/inode.c

between commit:

  830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")

from the fscache tree and commit:

  68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")

from the cifs 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.

diff --cc fs/cifs/inode.c
index dc2fe76450b96,279622e4eb1c2..0000000000000
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
  		iget_failed(inode);
  		inode = ERR_PTR(rc);
  	}
 +
- 	if (!rc) {
- 		/*
- 		 * The cookie is initialized from volume info returned above.
- 		 * Inside cifs_fscache_get_super_cookie it checks
- 		 * that we do not get super cookie twice.
- 		 */
- 		rc = cifs_fscache_get_super_cookie(tcon);
- 		if (rc < 0) {
- 			iget_failed(inode);
- 			inode = ERR_PTR(rc);
- 		}
- 	}
- 
  out:
  	kfree(path);
  	free_xid(xid);

Re: linux-next: manual merge of the cifs tree with the fscache tree

[Steve French]

David,
This cifs fscache fix should be upstream soon, so you should be able
to update the fscache series ontop of updated kernel soon

On Thu, Dec 16, 2021 at 6:43 AM <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the cifs tree got a conflict in:
>
>   fs/cifs/inode.c
>
> between commit:
>
>   830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
>
> from the fscache tree and commit:
>
>   68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")
>
> from the cifs 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.
>
> diff --cc fs/cifs/inode.c
> index dc2fe76450b96,279622e4eb1c2..0000000000000
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
>                 iget_failed(inode);
>                 inode = ERR_PTR(rc);
>         }
>  +
> -       if (!rc) {
> -               /*
> -                * The cookie is initialized from volume info returned above.
> -                * Inside cifs_fscache_get_super_cookie it checks
> -                * that we do not get super cookie twice.
> -                */
> -               rc = cifs_fscache_get_super_cookie(tcon);
> -               if (rc < 0) {
> -                       iget_failed(inode);
> -                       inode = ERR_PTR(rc);
> -               }
> -       }
> -
>   out:
>         kfree(path);
>         free_xid(xid);



-- 
Thanks,

Steve

Re: linux-next: manual merge of the cifs tree with the fscache tree

[David Howells]

Steve French <smfrench@gmail.com> wrote:

> This cifs fscache fix should be upstream soon, so you should be able
> to update the fscache series ontop of updated kernel soon

Thanks.

David

Re: linux-next: manual merge of the cifs tree with the fscache tree

[Stephen Rothwell]

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

Hi all,

On Thu, 16 Dec 2021 12:43:17 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the cifs tree got a conflict in:
> 
>   fs/cifs/inode.c
> 
> between commit:
> 
>   830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
> 
> from the fscache tree and commit:
> 
>   68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")

This is now commit

  b774302e8856 ("cifs: ignore resource_id while getting fscache super cookie")

in Linus' tree.

> from the cifs tree.
> 
> diff --cc fs/cifs/inode.c
> index dc2fe76450b96,279622e4eb1c2..0000000000000
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
>   		iget_failed(inode);
>   		inode = ERR_PTR(rc);
>   	}
>  +
> - 	if (!rc) {
> - 		/*
> - 		 * The cookie is initialized from volume info returned above.
> - 		 * Inside cifs_fscache_get_super_cookie it checks
> - 		 * that we do not get super cookie twice.
> - 		 */
> - 		rc = cifs_fscache_get_super_cookie(tcon);
> - 		if (rc < 0) {
> - 			iget_failed(inode);
> - 			inode = ERR_PTR(rc);
> - 		}
> - 	}
> - 
>   out:
>   	kfree(path);
>   	free_xid(xid);

so this is now a conflict between the fscache tree and Linus's tree.

-- 
Cheers,
Stephen Rothwell

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

RE: [EXTERNAL] Re: linux-next: manual merge of the cifs tree with the fscache tree

[Shyam Prasad]

-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au> 
Sent: Monday, December 20, 2021 5:16 AM
To: David Howells <dhowells@redhat.com>
Cc: broonie@kernel.org; Steve French <smfrench@gmail.com>; CIFS <linux-cifs@vger.kernel.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>; Shyam Prasad <Shyam.Prasad@microsoft.com>; Steven French <Steven.French@microsoft.com>
Subject: [EXTERNAL] Re: linux-next: manual merge of the cifs tree with the fscache tree

Hi all,

On Thu, 16 Dec 2021 12:43:17 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the cifs tree got a conflict in:
> 
>   fs/cifs/inode.c
> 
> between commit:
> 
>   830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
> 
> from the fscache tree and commit:
> 
>   68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")

This is now commit

  b774302e8856 ("cifs: ignore resource_id while getting fscache super cookie")

in Linus' tree.

> from the cifs tree.
> 
> diff --cc fs/cifs/inode.c
> index dc2fe76450b96,279622e4eb1c2..0000000000000
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
>   		iget_failed(inode);
>   		inode = ERR_PTR(rc);
>   	}
>  +
> - 	if (!rc) {
> - 		/*
> - 		 * The cookie is initialized from volume info returned above.
> - 		 * Inside cifs_fscache_get_super_cookie it checks
> - 		 * that we do not get super cookie twice.
> - 		 */
> - 		rc = cifs_fscache_get_super_cookie(tcon);
> - 		if (rc < 0) {
> - 			iget_failed(inode);
> - 			inode = ERR_PTR(rc);
> - 		}
> - 	}
> - 
>   out:
>   	kfree(path);
>   	free_xid(xid);

so this is now a conflict between the fscache tree and Linus's tree.

-- 
Cheers,
Stephen Rothwell

=================================
> so this is now a conflict between the fscache tree and Linus's tree.

Hi David and Steve,

I think one of these two branches need to be rebased. Can one of you please do it?

Regards,
Shyam

Re: [EXTERNAL] Re: linux-next: manual merge of the cifs tree with the fscache tree

[Stephen Rothwell]

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

Hi Shyam,

On Mon, 20 Dec 2021 04:31:27 +0000 Shyam Prasad <Shyam.Prasad@microsoft.com> wrote:
>
> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au> 
> Sent: Monday, December 20, 2021 5:16 AM
> To: David Howells <dhowells@redhat.com>
> Cc: broonie@kernel.org; Steve French <smfrench@gmail.com>; CIFS <linux-cifs@vger.kernel.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>; Shyam Prasad <Shyam.Prasad@microsoft.com>; Steven French <Steven.French@microsoft.com>
> Subject: [EXTERNAL] Re: linux-next: manual merge of the cifs tree with the fscache tree
> 
> Hi all,
> 
> On Thu, 16 Dec 2021 12:43:17 +0000 broonie@kernel.org wrote:
> >
> > Today's linux-next merge of the cifs tree got a conflict in:
> > 
> >   fs/cifs/inode.c
> > 
> > between commit:
> > 
> >   830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
> > 
> > from the fscache tree and commit:
> > 
> >   68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")  
> 
> This is now commit
> 
>   b774302e8856 ("cifs: ignore resource_id while getting fscache super cookie")
> 
> in Linus' tree.
> 
> > from the cifs tree.
> > 
> > diff --cc fs/cifs/inode.c
> > index dc2fe76450b96,279622e4eb1c2..0000000000000
> > --- a/fs/cifs/inode.c
> > +++ b/fs/cifs/inode.c
> > @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
> >   		iget_failed(inode);
> >   		inode = ERR_PTR(rc);
> >   	}
> >  +
> > - 	if (!rc) {
> > - 		/*
> > - 		 * The cookie is initialized from volume info returned above.
> > - 		 * Inside cifs_fscache_get_super_cookie it checks
> > - 		 * that we do not get super cookie twice.
> > - 		 */
> > - 		rc = cifs_fscache_get_super_cookie(tcon);
> > - 		if (rc < 0) {
> > - 			iget_failed(inode);
> > - 			inode = ERR_PTR(rc);
> > - 		}
> > - 	}
> > - 
> >   out:
> >   	kfree(path);
> >   	free_xid(xid);  
> 
> so this is now a conflict between the fscache tree and Linus's tree.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> =================================
> > so this is now a conflict between the fscache tree and Linus's tree.  
> 
> Hi David and Steve,
> 
> I think one of these two branches need to be rebased. Can one of you please do it?

Nothing needs t be done, the conflict is trivial.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the cifs tree with the fscache tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the cifs tree got conflicts in:

  fs/cifs/file.c
  fs/cifs/fscache.h

between commit:

  a91e6e1c8074 ("cifs: Support fscache indexing rewrite")

from the fscache tree and commit:

  70431bfd825d ("cifs: Support fscache indexing rewrite")

from the cifs tree.

I fixed it up (I just used the latter version) 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 --]

Re: linux-next: manual merge of the cifs tree with the fscache tree

[David Howells]

Hi Stephen,

> >   9d0245fc6a2e ("cifs: wait for tcon resource_id before getting fscache super")
> >   c148f8eb032f ("cifs: add server conn_id to fscache client cookie")
> >   b1f962ba272b ("cifs: avoid use of dstaddr as key for fscache client cookie")

I've rebased onto -rc4 to pick up these and another patch.

David

Re: linux-next: manual merge of the cifs tree with the fscache tree

[Stephen Rothwell]

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

Hi all,

On Fri, 3 Dec 2021 09:41:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> Today's linux-next merge of the cifs tree got conflicts in:
> 
>   fs/cifs/connect.c
>   fs/cifs/fscache.c
> 
> between commit:
> 
>   935b45107a80 ("cifs: Support fscache indexing rewrite (untested)")
> 
> from the fscache tree and commits:
> 
>   9d0245fc6a2e ("cifs: wait for tcon resource_id before getting fscache super")
>   c148f8eb032f ("cifs: add server conn_id to fscache client cookie")
>   b1f962ba272b ("cifs: avoid use of dstaddr as key for fscache client cookie")
> 
> from the cifs tree.
> 
> I fixed it up (I just used the former versions) 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.

These are now conflict between the fscache tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the cifs tree with the fscache tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the cifs tree got conflicts in:

  fs/cifs/connect.c
  fs/cifs/fscache.c

between commit:

  935b45107a80 ("cifs: Support fscache indexing rewrite (untested)")

from the fscache tree and commits:

  9d0245fc6a2e ("cifs: wait for tcon resource_id before getting fscache super")
  c148f8eb032f ("cifs: add server conn_id to fscache client cookie")
  b1f962ba272b ("cifs: avoid use of dstaddr as key for fscache client cookie")

from the cifs tree.

I fixed it up (I just used the former versions) 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 --]