Commit 11e7c218 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20180605' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "This just contains the dm kzalloc fix that was discussed, and a fix
  that I queued up yesterday for a case where blk-mq doesn't honor the
  stop bit appropriately"

* tag 'for-linus-20180605' of git://git.kernel.dk/linux-block:
  dm: Use kzalloc for all structs with embedded biosets/mempools
  blk-mq: return when hctx is stopped in blk_mq_run_work_fn
parents 9b68ac22 d3775354

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static void blk_mq_run_work_fn(struct work_struct *work) 
	 * If we are stopped, don't run the queue.

	 */

	if (test_bit(BLK_MQ_S_STOPPED, &hctx->state))

		clear_bit(BLK_MQ_S_STOPPED, &hctx->state);

		return;



	__blk_mq_run_hw_queue(hctx);

}

drivers/md/dm-bio-prison-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct kmem_cache *_cell_cache; 
 */

struct dm_bio_prison *dm_bio_prison_create(void)

{

	struct dm_bio_prison *prison = kmalloc(sizeof(*prison), GFP_KERNEL);

	struct dm_bio_prison *prison = kzalloc(sizeof(*prison), GFP_KERNEL);

	int ret;



	if (!prison)

drivers/md/dm-bio-prison-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct kmem_cache *_cell_cache; 
 */

struct dm_bio_prison_v2 *dm_bio_prison_create_v2(struct workqueue_struct *wq)

{

	struct dm_bio_prison_v2 *prison = kmalloc(sizeof(*prison), GFP_KERNEL);

	struct dm_bio_prison_v2 *prison = kzalloc(sizeof(*prison), GFP_KERNEL);

	int ret;



	if (!prison)

drivers/md/dm-io.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct dm_io_client *dm_io_client_create(void) 
	unsigned min_ios = dm_get_reserved_bio_based_ios();

	int ret;



	client = kmalloc(sizeof(*client), GFP_KERNEL);

	client = kzalloc(sizeof(*client), GFP_KERNEL);

	if (!client)

		return ERR_PTR(-ENOMEM);

drivers/md/dm-kcopyd.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *thro 
	int r;

	struct dm_kcopyd_client *kc;



	kc = kmalloc(sizeof(*kc), GFP_KERNEL);

	kc = kzalloc(sizeof(*kc), GFP_KERNEL);

	if (!kc)

		return ERR_PTR(-ENOMEM);

CRA Git | Maintained and supported by SUSTech CRA and CCSE