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>] [day] [month] [year] [list]
Message-ID: <20221215083604.5a920366@canb.auug.org.au>
Date:   Thu, 15 Dec 2022 08:36:04 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steven Whitehouse <swhiteho@...hat.com>,
        Bob Peterson <rpeterso@...hat.com>
Cc:     Andreas Gruenbacher <agruenba@...hat.com>,
        Dave Chinner <david@...morbit.com>,
        Dave Chinner <dchinner@...hat.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 Linus' tree

Hi all,

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

  include/linux/iomap.h

between commit:

  d7b64041164c ("iomap: write iomap validity checks")

from Linus' tree and commit:

  2057bcfa562b ("iomap: Move page_done callback under the folio lock")

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 include/linux/iomap.h
index 0983dfc9a203,bd6d80453726..000000000000
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@@ -137,24 -127,7 +137,24 @@@ static inline bool iomap_inline_data_va
  struct iomap_page_ops {
  	int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len);
  	void (*page_done)(struct inode *inode, loff_t pos, unsigned copied,
- 			struct page *page);
+ 			struct folio *folio);
 +
 +	/*
 +	 * Check that the cached iomap still maps correctly to the filesystem's
 +	 * internal extent map. FS internal extent maps can change while iomap
 +	 * is iterating a cached iomap, so this hook allows iomap to detect that
 +	 * the iomap needs to be refreshed during a long running write
 +	 * operation.
 +	 *
 +	 * The filesystem can store internal state (e.g. a sequence number) in
 +	 * iomap->validity_cookie when the iomap is first mapped to be able to
 +	 * detect changes between mapping time and whenever .iomap_valid() is
 +	 * called.
 +	 *
 +	 * This is called with the folio over the specified file position held
 +	 * locked by the iomap code.
 +	 */
 +	bool (*iomap_valid)(struct inode *inode, const struct iomap *iomap);
  };
  
  /*

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ