linux-next: manual merge of the block tree with the gfs2 tree

[Stephen Rothwell]

Hi all,

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

  mm/filemap.c

between commit:

  f0091f595dee ("fs: Add IOCB_NOIO flag for generic_file_read_iter")

from the gfs2 tree and commits:

  2e85abf053b9 ("mm: allow read-ahead with IOCB_NOWAIT set")
  dd3e6d5039de ("mm: add support for async page locking")

from the block tree.

The gfs2 tree commit has changed from the previous report.

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 mm/filemap.c
index 6a6ed95e33a2,a5b1fa8f7ce4..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -2028,8 -2044,6 +2044,8 @@@ find_page
  
  		page = find_get_page(mapping, index);
  		if (!page) {
- 			if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO))
++			if (iocb->ki_flags & IOCB_NOIO)
 +				goto would_block;
  			page_cache_sync_readahead(mapping,
  					ra, filp,
  					index, last_index - index);
@@@ -2164,7 -2185,7 +2191,7 @@@ page_not_up_to_date_locked
  		}
  
  readpage:
- 		if (iocb->ki_flags & IOCB_NOIO) {
 -		if (iocb->ki_flags & IOCB_NOWAIT) {
++		if (iocb->ki_flags & (IOCB_NOWAIT |IOCB_NOIO)) {
  			unlock_page(page);
  			put_page(page);
  			goto would_block;

Attachment: pgpJrexLNbllf.pgp
Description: OpenPGP digital signature