Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71baba4b authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM 



__GFP_WAIT was used to signal that the caller was in atomic context and
could not sleep.  Now it is possible to distinguish between true atomic
context and callers that are not willing to sleep.  The latter should
clear __GFP_DIRECT_RECLAIM so kswapd will still wake.  As clearing
__GFP_WAIT behaves differently, there is a risk that people will clear the
wrong flags.  This patch renames __GFP_WAIT to __GFP_RECLAIM to clearly
indicate what it does -- setting it allows all reclaim activity, clearing
them prevents it.

[akpm@linux-foundation.org: fix build]
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Christoph Lameter <cl@linux.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Vitaly Wool <vitalywool@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 40113370

block/blk-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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_DIRECT_RECLAIM) == 0)) {



			q->make_request_fn(q, bio);

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ static struct request *blk_mq_map_request(struct request_queue *q, 
		ctx = blk_mq_get_ctx(q);

		hctx = q->mq_ops->map_queue(q, ctx->cpu);

		blk_mq_set_alloc_data(&alloc_data, q,

				__GFP_WAIT|__GFP_HIGH, false, ctx, hctx);

				__GFP_RECLAIM|__GFP_HIGH, false, ctx, hctx);

		rq = __blk_mq_alloc_request(&alloc_data, rw);

		ctx = alloc_data.ctx;

		hctx = alloc_data.hctx;

block/scsi_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 


	}



	rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);

	rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_RECLAIM);

	if (IS_ERR(rq)) {

		err = PTR_ERR(rq);

		goto error_free_buffer;
@@ -495,7 +495,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
		break;

	}



	if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, __GFP_WAIT)) {

	if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, __GFP_RECLAIM)) {

		err = DRIVER_ERROR << 24;

		goto error;

	}
@@ -536,7 +536,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, 
	struct request *rq;

	int err;



	rq = blk_get_request(q, WRITE, __GFP_WAIT);

	rq = blk_get_request(q, WRITE, __GFP_RECLAIM);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

	blk_rq_set_block_pc(rq);

drivers/block/drbd/drbd_bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho 
	bm_set_page_unchanged(b->bm_pages[page_nr]);



	if (ctx->flags & BM_AIO_COPY_PAGES) {

		page = mempool_alloc(drbd_md_io_page_pool, __GFP_HIGHMEM|__GFP_WAIT);

		page = mempool_alloc(drbd_md_io_page_pool, __GFP_HIGHMEM|__GFP_RECLAIM);

		copy_highpage(page, b->bm_pages[page_nr]);

		bm_store_page_idx(page, page_nr);

	} else

drivers/block/mtip32xx/mtip32xx.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static struct mtip_cmd *mtip_get_int_command(struct driver_data *dd) 
{

	struct request *rq;



	rq = blk_mq_alloc_request(dd->queue, 0, __GFP_WAIT, true);

	rq = blk_mq_alloc_request(dd->queue, 0, __GFP_RECLAIM, true);

	return blk_mq_rq_to_pdu(rq);

}