Commit d2b1c81f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.8-2020-06-19' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Use import_uuid() where appropriate (Andy)

 - bcache fixes (Coly, Mauricio, Zhiqiang)

 - blktrace sparse warnings fix (Jan)

 - blktrace concurrent setup fix (Luis)

 - blkdev_get use-after-free fix (Jason)

 - Ensure all blk-mq maps are updated (Weiping)

 - Loop invalidate bdev fix (Zheng)

* tag 'block-5.8-2020-06-19' of git://git.kernel.dk/linux-block:
  block: make function 'kill_bdev' static
  loop: replace kill_bdev with invalidate_bdev
  partitions/ldm: Replace uuid_copy() with import_uuid() where it makes sense
  block: update hctx map when use multiple maps
  blktrace: Avoid sparse warnings when assigning q->blk_trace
  blktrace: break out of blktrace setup on concurrent calls
  block: Fix use-after-free in blkdev_get()
  trace/events/block.h: drop kernel-doc for dropped function parameter
  blk-mq: Remove redundant 'return' statement
  bcache: pr_info() format clean up in bcache_device_init()
  bcache: use delayed kworker fo asynchronous devices registration
  bcache: check and adjust logical block size for backing devices
  bcache: fix potential deadlock problem in btree_gc_coalesce
parents 592be758 3373a346

block/blk-mq-tag.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static void __blk_mq_all_tag_iter(struct blk_mq_tags *tags, 
void blk_mq_all_tag_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,

		void *priv)

{

	return __blk_mq_all_tag_iter(tags, fn, priv, BT_TAG_ITER_STATIC_RQS);

	__blk_mq_all_tag_iter(tags, fn, priv, BT_TAG_ITER_STATIC_RQS);

}



/**

block/blk-mq.c

+3 −1
Original line number Diff line number Diff line
@@ -3479,7 +3479,9 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, 


	if (set->nr_maps == 1 && nr_hw_queues > nr_cpu_ids)

		nr_hw_queues = nr_cpu_ids;

	if (nr_hw_queues < 1 || nr_hw_queues == set->nr_hw_queues)

	if (nr_hw_queues < 1)

		return;

	if (set->nr_maps == 1 && nr_hw_queues == set->nr_hw_queues)

		return;



	list_for_each_entry(q, &set->tag_list, tag_set_list)

block/partitions/ldm.c

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static bool ldm_parse_dsk4 (const u8 *buffer, int buflen, struct vblk *vb) 
		return false;



	disk = &vb->vblk.disk;

	uuid_copy(&disk->disk_id, (uuid_t *)(buffer + 0x18 + r_name));

	import_uuid(&disk->disk_id, buffer + 0x18 + r_name);

	return true;

}

drivers/block/loop.c

+4 −4
Original line number Diff line number Diff line
@@ -1368,14 +1368,14 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) 
	    lo->lo_sizelimit != info->lo_sizelimit) {

		size_changed = true;

		sync_blockdev(lo->lo_device);

		kill_bdev(lo->lo_device);

		invalidate_bdev(lo->lo_device);

	}



	/* I/O need to be drained during transfer transition */

	blk_mq_freeze_queue(lo->lo_queue);



	if (size_changed && lo->lo_device->bd_inode->i_mapping->nrpages) {

		/* If any pages were dirtied after kill_bdev(), try again */

		/* If any pages were dirtied after invalidate_bdev(), try again */

		err = -EAGAIN;

		pr_warn("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n",

			__func__, lo->lo_number, lo->lo_file_name,
@@ -1615,11 +1615,11 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg) 
		return 0;



	sync_blockdev(lo->lo_device);

	kill_bdev(lo->lo_device);

	invalidate_bdev(lo->lo_device);



	blk_mq_freeze_queue(lo->lo_queue);



	/* kill_bdev should have truncated all the pages */

	/* invalidate_bdev should have truncated all the pages */

	if (lo->lo_device->bd_inode->i_mapping->nrpages) {

		err = -EAGAIN;

		pr_warn("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n",

drivers/md/bcache/btree.c

+6 −2
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, 
			if (__set_blocks(n1, n1->keys + n2->keys,

					 block_bytes(b->c)) >

			    btree_blocks(new_nodes[i]))

				goto out_nocoalesce;

				goto out_unlock_nocoalesce;



			keys = n2->keys;

			/* Take the key of the node we're getting rid of */
@@ -1418,7 +1418,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, 


		if (__bch_keylist_realloc(&keylist,

					  bkey_u64s(&new_nodes[i]->key)))

			goto out_nocoalesce;

			goto out_unlock_nocoalesce;



		bch_btree_node_write(new_nodes[i], &cl);

		bch_keylist_add(&keylist, &new_nodes[i]->key);
@@ -1464,6 +1464,10 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, 
	/* Invalidated our iterator */

	return -EINTR;



out_unlock_nocoalesce:

	for (i = 0; i < nodes; i++)

		mutex_unlock(&new_nodes[i]->write_lock);



out_nocoalesce:

	closure_sync(&cl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE