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

Commit 0eb0b63c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: consistently use GFP_NOIO instead of __GFP_NORECLAIM 



Same numerical value (for now at least), but a much better documentation
of intent.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c3036021

block/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,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_RECLAIM)) {

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

		err = DRIVER_ERROR << 24;

		goto error;

	}

drivers/block/drbd/drbd_bitmap.c

+2 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,8 @@ 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_RECLAIM);

		page = mempool_alloc(drbd_md_io_page_pool,

				GFP_NOIO | __GFP_HIGHMEM);

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

		bm_store_page_idx(page, page_nr);

	} else

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 


	if (cgc->buflen) {

		ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,

				      __GFP_RECLAIM);

				      GFP_NOIO);

		if (ret)

			goto out;

	}

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size) 


	if (size) {

		ret = blk_rq_map_kern(drive->queue, rq, tape->buf, size,

				      __GFP_RECLAIM);

				      GFP_NOIO);

		if (ret)

			goto out_put;

	}

drivers/ide/ide-taskfile.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf, 
	 */

	if (nsect) {

		error = blk_rq_map_kern(drive->queue, rq, buf,

					nsect * SECTOR_SIZE, __GFP_RECLAIM);

					nsect * SECTOR_SIZE, GFP_NOIO);

		if (error)

			goto put_req;

	}