openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-05-09 09:54:07 +02:00 committed by Jens Axboe
parent 4accf5fc79
commit c3036021c7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/blk-core.c
View File

@ -1577,8 +1577,7 @@ static struct request *blk_old_get_request(struct request_queue *q,
unsigned int op, blk_mq_req_flags_t flags) unsigned int op, blk_mq_req_flags_t flags)
{ {
struct request *rq; struct request *rq;
gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC : gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC : GFP_NOIO;
__GFP_DIRECT_RECLAIM;
int ret = 0; int ret = 0;
WARN_ON_ONCE(q->mq_ops); WARN_ON_ONCE(q->mq_ops);
@ -2056,7 +2055,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)
* Returns with the queue unlocked. * Returns with the queue unlocked.
*/ */
blk_queue_enter_live(q); 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)) { if (IS_ERR(req)) {
blk_queue_exit(q); blk_queue_exit(q);
__wbt_done(q->rq_wb, wb_acct); __wbt_done(q->rq_wb, wb_acct);