From: Christoph Hellwig Date: Wed, 9 May 2018 07:54:07 +0000 (+0200) Subject: block: use GFP_NOIO instead of __GFP_DIRECT_RECLAIM X-Git-Tag: v4.18-rc1~192^2~111 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3036021c7bd488a382ebb15bd48225941a8686e;p=thirdparty%2Fkernel%2Flinux.git block: use GFP_NOIO instead of __GFP_DIRECT_RECLAIM We just can't do I/O when doing block layer requests allocations, so use GFP_NOIO instead of the even more limited __GFP_DIRECT_RECLAIM. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe --- diff --git a/block/blk-core.c b/block/blk-core.c index 1fe7c7cf42fec..341501c5e239d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1577,8 +1577,7 @@ static struct request *blk_old_get_request(struct request_queue *q, unsigned int op, blk_mq_req_flags_t flags) { struct request *rq; - gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC : - __GFP_DIRECT_RECLAIM; + gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC : GFP_NOIO; int ret = 0; WARN_ON_ONCE(q->mq_ops); @@ -2056,7 +2055,7 @@ get_rq: * Returns with the queue unlocked. */ blk_queue_enter_live(q); - req = get_request(q, bio->bi_opf, bio, 0, __GFP_DIRECT_RECLAIM); + req = get_request(q, bio->bi_opf, bio, 0, GFP_NOIO); if (IS_ERR(req)) { blk_queue_exit(q); __wbt_done(q->rq_wb, wb_acct);