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

Commit 08885643 authored by Kiyoshi Ueda's avatar Kiyoshi Ueda Committed by Alasdair G Kergon
Browse files

dm: pass gfp_mask to alloc_rq_tio 



This patch adds the gfp_mask argument to alloc_rq_tio().
No functional change.

This patch is a preparation for a later patch in this series which needs to
allocate tio (for barrier I/O) with different allocation flag (GFP_NOIO) from
the one in the normal I/O code path.

Signed-off-by: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 598de409

drivers/md/dm.c

+4 −3
Original line number Diff line number Diff line
@@ -432,9 +432,10 @@ static void free_tio(struct mapped_device *md, struct dm_target_io *tio) 
	mempool_free(tio, md->tio_pool);

}



static struct dm_rq_target_io *alloc_rq_tio(struct mapped_device *md)

static struct dm_rq_target_io *alloc_rq_tio(struct mapped_device *md,

					    gfp_t gfp_mask)

{

	return mempool_alloc(md->tio_pool, GFP_ATOMIC);

	return mempool_alloc(md->tio_pool, gfp_mask);

}



static void free_rq_tio(struct dm_rq_target_io *tio)
@@ -1471,7 +1472,7 @@ static int dm_prep_fn(struct request_queue *q, struct request *rq) 
		return BLKPREP_KILL;

	}



	tio = alloc_rq_tio(md); /* Only one for each original request */

	tio = alloc_rq_tio(md, GFP_ATOMIC);

	if (!tio)

		/* -ENOMEM */

		return BLKPREP_DEFER;