From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>,
Steven Whitehouse <swhiteho@redhat•com>,
Bob Peterson <rpeterso@redhat•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Andreas Gruenbacher <agruenba@redhat•com>
Subject: linux-next: manual merge of the block tree with the gfs2 tree
Date: Tue, 7 Jul 2020 12:26:09 +1000 [thread overview]
Message-ID: <20200707122609.75970e83@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]
Hi all,
Today's linux-next merge of the block tree got conflicts in:
include/linux/fs.h
mm/filemap.c
between commit:
00a83a3c014a ("fs: Add IOCB_NOIO flag for generic_file_read_iter")
from the gfs2 tree and commits:
dd3e6d5039de ("mm: add support for async page locking")
2e85abf053b9 ("mm: allow read-ahead with IOCB_NOWAIT set")
from the block tree.
I fixed it up (I think - 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/fs.h
index 90b9f8b4c540,da90323b9f92..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -315,7 -318,8 +318,9 @@@ enum rw_hint
#define IOCB_SYNC (1 << 5)
#define IOCB_WRITE (1 << 6)
#define IOCB_NOWAIT (1 << 7)
+#define IOCB_NOIO (1 << 8)
+ /* iocb->ki_waitq is valid */
-#define IOCB_WAITQ (1 << 8)
++#define IOCB_WAITQ (1 << 9)
struct kiocb {
struct file *ki_filp;
diff --cc mm/filemap.c
index 10e7eb3aada0,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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-07 2:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 2:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-08 3:13 linux-next: manual merge of the block tree with the gfs2 tree Stephen Rothwell
2025-05-08 3:50 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200707122609.75970e83@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agruenba@redhat$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rpeterso@redhat$(echo .)com \
--cc=swhiteho@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox