linux-next: manual merge of the gfs2 tree with Linus' tree

linux-next: manual merge of the gfs2 tree with Linus' tree

[Stephen Rothwell]

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

Hi Steven,

Today's linux-next merge of the gfs2 tree got a conflict in fs/gfs2/log.c
between commit 721a9602e660 ("block: kill off REQ_UNPLUG") from Linus'
tree and commit 7ef2a4f51303 ("GFS2: Use filemap_fdatawrite() to write
back the AIL") from the gfs2 tree.

The former removed some of the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Steven Whitehouse]

Hi,

On Fri, 2011-04-01 at 10:55 +1100, Stephen Rothwell wrote:
> Hi Steven,
> 
> Today's linux-next merge of the gfs2 tree got a conflict in fs/gfs2/log.c
> between commit 721a9602e660 ("block: kill off REQ_UNPLUG") from Linus'
> tree and commit 7ef2a4f51303 ("GFS2: Use filemap_fdatawrite() to write
> back the AIL") from the gfs2 tree.
> 
> The former removed some of the code modified by the latter, so I did that.

Sorry for the delay as I was away last week. That was the correct fix
and I've updated the tree so that it shouldn't be an issue any more,

Steve.

linux-next: manual merge of the gfs2 tree with Linus' tree

[Stephen Rothwell]

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

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);
  };
  
  /*

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