linux-next: manual merge of the ext4 tree with the mm-stable tree

linux-next: manual merge of the ext4 tree with the mm-stable tree

[broonie]

Hi all,

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

  include/linux/pagemap.h

between commit:

  263e721e3ba1f ("mm: make mapping_get_entry available outside of filemap.c")

from the mm-stable tree and commit:

  e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN")

from the ext4 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 include/linux/pagemap.h
index fdcd595d22944,51b75b89730ed..0000000000000
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@@ -504,9 -504,11 +504,11 @@@ pgoff_t page_cache_prev_miss(struct add
  #define FGP_NOFS		0x00000010
  #define FGP_NOWAIT		0x00000020
  #define FGP_FOR_MMAP		0x00000040
 -#define FGP_ENTRY		0x00000080
 -#define FGP_STABLE		0x00000100
 +#define FGP_STABLE		0x00000080
  
+ #define FGP_WRITEBEGIN		(FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE)
+ 
 +void *filemap_get_entry(struct address_space *mapping, pgoff_t index);
  struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index,
  		int fgp_flags, gfp_t gfp);
  struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,

linux-next: manual merge of the ext4 tree with the mm-stable tree

[broonie]

Hi all,

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

  fs/iomap/buffered-io.c

between commit:

  66dabbb65d673 ("mm: return an ERR_PTR from __filemap_get_folio")

from the mm-stable tree and commit:

  e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN")

from the ext4 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/iomap/buffered-io.c
index 96bb56c203f49,10a2035155835..0000000000000
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -467,7 -467,8 +467,7 @@@ EXPORT_SYMBOL_GPL(iomap_is_partially_up
   */
  struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos)
  {
- 	unsigned fgp = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE | FGP_NOFS;
+ 	unsigned fgp = FGP_WRITEBEGIN | FGP_NOFS;
 -	struct folio *folio;
  
  	if (iter->flags & IOMAP_NOWAIT)
  		fgp |= FGP_NOWAIT;

linux-next: manual merge of the ext4 tree with the mm-stable tree

[broonie]

Hi all,

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

  fs/nfs/file.c

between commit:

  66dabbb65d673 ("mm: return an ERR_PTR from __filemap_get_folio")

from the mm-stable tree and commit:

  e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN")

from the ext4 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/nfs/file.c
index 1d03406e6c039,2474cbc30712a..0000000000000
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -335,9 -326,10 +326,10 @@@ static int nfs_write_begin(struct file 
  		file, mapping->host->i_ino, len, (long long) pos);
  
  start:
- 	folio = nfs_folio_grab_cache_write_begin(mapping, pos >> PAGE_SHIFT);
+ 	folio = __filemap_get_folio(mapping, pos >> PAGE_SHIFT, FGP_WRITEBEGIN,
+ 				    mapping_gfp_mask(mapping));
 -	if (!folio)
 -		return -ENOMEM;
 +	if (IS_ERR(folio))
 +		return PTR_ERR(folio);
  	*pagep = &folio->page;
  
  	ret = nfs_flush_incompatible(file, folio);