From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 14 Dec 2020 15:05:26 +0000 (-0700)
Subject: Merge branch 'for-5.11/block' into for-5.11/block-merged
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=refs%2Fheads%2Ffor-5.11%2Fblock-merged;p=linux-2.6-block.git

Merge branch 'for-5.11/block' into for-5.11/block-merged

* for-5.11/block: (126 commits)
  blk-mq: fix msec comment from micro to milli seconds
  blk-mq: update arg in comment of blk_mq_map_queue
  blk-mq: add helper allocating tagset->tags
  Revert "block: Fix a lockdep complaint triggered by request queue flushing"
  nvme-loop: use blk_mq_hctx_set_fq_lock_class to set loop's lock class
  blk-mq: add new API of blk_mq_hctx_set_fq_lock_class
  block: disable iopoll for split bio
  block: Improve blk_revalidate_disk_zones() checks
  sbitmap: simplify wrap check
  sbitmap: replace CAS with atomic and
  sbitmap: remove swap_lock
  sbitmap: optimise sbitmap_deferred_clear()
  blk-mq: skip hybrid polling if iopoll doesn't spin
  blk-iocost: Factor out the base vrate change into a separate function
  blk-iocost: Factor out the active iocgs' state check into a separate function
  blk-iocost: Move the usage ratio calculation to the correct place
  blk-iocost: Remove unnecessary advance declaration
  blk-iocost: Fix some typos in comments
  blktrace: fix up a kerneldoc comment
  block: remove the request_queue to argument request based tracepoints
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

7134fdd950f21ab265ac22e83bf21d874396e047
diff --cc drivers/md/raid0.c
index 35843df15b5e,e5d7411cba9b..67f157f2525d
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@@ -500,18 -499,9 +500,18 @@@ static void raid0_handle_discard(struc
  
  		rdev = conf->devlist[(zone - conf->strip_zone) *
  			conf->strip_zone[0].nb_dev + disk];
 -		md_submit_discard_bio(mddev, rdev, bio,
 +		if (__blkdev_issue_discard(rdev->bdev,
  			dev_start + zone->dev_start + rdev->data_offset,
 -			dev_end - dev_start);
 +			dev_end - dev_start, GFP_NOIO, 0, &discard_bio) ||
 +		    !discard_bio)
 +			continue;
 +		bio_chain(discard_bio, bio);
 +		bio_clone_blkg_association(discard_bio, bio);
 +		if (mddev->gendisk)
- 			trace_block_bio_remap(bdev_get_queue(rdev->bdev),
- 				discard_bio, disk_devt(mddev->gendisk),
++			trace_block_bio_remap(discard_bio,
++				disk_devt(mddev->gendisk),
 +				bio->bi_iter.bi_sector);
 +		submit_bio_noacct(discard_bio);
  	}
  	bio_endio(bio);
  }
diff --cc fs/btrfs/volumes.c
index 78637665166e,fbc4b58228f7..51fd430d6080
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@@ -929,24 -929,18 +929,24 @@@ static noinline struct btrfs_device *de
  		 * make sure it's the same device if the device is mounted
  		 */
  		if (device->bdev) {
- 			struct block_device *path_bdev;
+ 			int error;
+ 			dev_t path_dev;
  
- 			path_bdev = lookup_bdev(path);
- 			if (IS_ERR(path_bdev)) {
+ 			error = lookup_bdev(path, &path_dev);
+ 			if (error) {
  				mutex_unlock(&fs_devices->device_list_mutex);
- 				return ERR_CAST(path_bdev);
+ 				return ERR_PTR(error);
  			}
  
- 			if (device->bdev != path_bdev) {
- 				bdput(path_bdev);
+ 			if (device->bdev->bd_dev != path_dev) {
  				mutex_unlock(&fs_devices->device_list_mutex);
 -				btrfs_warn_in_rcu(device->fs_info,
 +				/*
 +				 * device->fs_info may not be reliable here, so
 +				 * pass in a NULL instead. This avoids a
 +				 * possible use-after-free when the fs_info and
 +				 * fs_info->sb are already torn down.
 +				 */
 +				btrfs_warn_in_rcu(NULL,
  	"duplicate device %s devid %llu generation %llu scanned by %s (%d)",
  						  path, devid, found_transid,
  						  current->comm,