Re: linux-next: manual merge of the gfs2 tree with the btrfs tree

[Stephen Rothwell]

Hi all,

On Tue, 10 May 2022 10:24:58 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the gfs2 tree got a conflict in:
> 
>   fs/gfs2/file.c
> 
> between commit:
> 
>   39c93b0bf7a6 ("iomap: add per-iomap_iter private data")
> 
> from the btrfs tree and commit:
> 
>   db0c1968e935 ("gfs2: Variable rename")
> 
> from the gfs2 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/gfs2/file.c
> index 76307a90bf81,d18a7c2201c0..000000000000
> --- a/fs/gfs2/file.c
> +++ b/fs/gfs2/file.c
> @@@ -839,11 -839,12 +839,12 @@@ retry_under_glock
>   	pagefault_disable();
>   	to->nofault = true;
>   	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL,
> - 			   IOMAP_DIO_PARTIAL, NULL, written);
>  -			   IOMAP_DIO_PARTIAL, read);
> ++			   IOMAP_DIO_PARTIAL, NULL, read);
>   	to->nofault = false;
>   	pagefault_enable();
> + 	/* No increment (+=) because iomap_dio_rw returns a cumulative value. */
>   	if (ret > 0)
> - 		written = ret;
> + 		read = ret;
>   
>   	if (should_fault_in_pages(ret, to, &prev_count, &window_size)) {
>   		size_t leftover;
> @@@ -906,7 -908,7 +908,7 @@@ retry_under_glock
>   
>   	from->nofault = true;
>   	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,
> - 			   IOMAP_DIO_PARTIAL, NULL, read);
>  -			   IOMAP_DIO_PARTIAL, written);
> ++			   IOMAP_DIO_PARTIAL, NULL, written);
>   	from->nofault = false;
>   
>   	if (ret == -ENOTBLK)

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

-- 
Cheers,
Stephen Rothwell

Attachment: pgpe4zPtty2S2.pgp
Description: OpenPGP digital signature