From: Mel Gorman <mgorman@techsingularity.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Jens Axboe <axboe@kernel.dk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dan Williams <dan.j.williams@intel.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the block tree
Date: Sun, 1 Nov 2015 18:38:53 +0000 [thread overview]
Message-ID: <20151101183853.GB22902@techsingularity.net> (raw)
In-Reply-To: <20151102025125.0f335513@canb.auug.org.au>
On Mon, Nov 02, 2015 at 02:51:25AM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> block/blk-mq.c
>
> between commit:
>
> 3ef28e83ab15 ("block: generic request_queue reference counting")
>
> from the block tree and commit:
>
> 7cc8e61bde7a ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd")
> 415a13cc1c3c ("mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM")
>
> from the akpm-current tree.
>
> I fixed it up (the code updated in the latter was moved by the former,
> so I applied the following merge fix patch) and can carry the fix as
> necessary (no action is required).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Nov 2015 02:49:02 +1100
> Subject: [PATCH] block: fixes for __GPF_WAIT changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> block/blk-core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 9e32f0868e36..6f2c263f478b 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -638,7 +638,7 @@ int blk_queue_enter(struct request_queue *q, gfp_t gfp)
> if (percpu_ref_tryget_live(&q->q_usage_counter))
> return 0;
>
> - if (!(gfp & __GFP_WAIT))
> + if (!gfpflags_allow_blocking(gfp))
> return -EBUSY;
>
> ret = wait_event_interruptible(q->mq_freeze_wq,
> @@ -2038,7 +2038,7 @@ void generic_make_request(struct bio *bio)
> do {
> struct request_queue *q = bdev_get_queue(bio->bi_bdev);
>
> - if (likely(blk_queue_enter(q, __GFP_WAIT) == 0)) {
> + if (likely(blk_queue_enter(q, __GFP_RECLAIM) == 0)) {
>
> q->make_request_fn(q, bio);
>
Hi Stephen,
___GFP_DIRECT_RECLAIM is more appropriate than __GFP_RECLAIM in the
second hunk.
Thanks.
--
Mel Gorman
SUSE Labs
next prev parent reply other threads:[~2015-11-01 18:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-01 15:51 linux-next: manual merge of the akpm-current tree with the block tree Stephen Rothwell
2015-11-01 16:04 ` kbuild test robot
2015-11-01 16:05 ` kbuild test robot
2015-11-01 18:38 ` Mel Gorman [this message]
2015-11-01 21:51 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-06-02 5:40 Stephen Rothwell
2021-04-07 9:18 Stephen Rothwell
2021-03-18 6:17 Stephen Rothwell
2021-03-18 17:54 ` Shakeel Butt
2021-03-18 18:19 ` Jens Axboe
2020-11-17 5:05 Stephen Rothwell
2020-10-15 6:27 Stephen Rothwell
2020-09-25 9:57 Stephen Rothwell
2019-05-03 9:10 Stephen Rothwell
2019-05-03 12:35 ` Amir Goldstein
2018-10-02 7:21 Stephen Rothwell
2018-08-13 7:51 Stephen Rothwell
2018-08-02 8:31 Stephen Rothwell
2018-03-19 6:36 Stephen Rothwell
2016-07-13 6:14 Stephen Rothwell
2016-07-13 16:31 ` Jens Axboe
2015-12-07 8:12 Stephen Rothwell
2015-12-07 19:44 ` Andrew Morton
2015-12-07 20:24 ` Stephen Rothwell
2015-01-21 7:14 Stephen Rothwell
2014-07-02 6:06 Stephen Rothwell
2013-11-05 6:29 Stephen Rothwell
2013-11-05 6:25 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=20151101183853.GB22902@techsingularity.net \
--to=mgorman@techsingularity.net \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).