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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220510102458.0ab0172f@canb.auug.org.au>
Date:   Tue, 10 May 2022 10:24:58 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steven Whitehouse <swhiteho@...hat.com>,
        Bob Peterson <rpeterso@...hat.com>,
        David Sterba <dsterba@...e.cz>
Cc:     Andreas Gruenbacher <agruenba@...hat.com>,
        Christoph Hellwig <hch@....de>,
        David Sterba <dsterba@...e.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the gfs2 tree with the btrfs tree

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

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)

Content of type "application/pgp-signature" skipped