On 12/14/20 8:06 AM, Jens Axboe wrote: > Hi Linus, > > Another series of killing more code than what is being added, again > thanks to Christoph's relentless cleanups and tech debt tackling. Note > that there are a fix merge resolutions that need to be done, see below > changelog. > > This pull request contains: > > - blk-iocost improvements (Baolin Wang) > > - part0 iostat fix (Jeffle Xu) > > - Disable iopoll for split bios (Jeffle Xu) > > - block tracepoint cleanups (Christoph Hellwig) > > - Merging of struct block_device and hd_struct (Christoph Hellwig) > > - Rework/cleanup of how block device sizes are updated (Christoph > Hellwig) > > - Simplification of gendisk lookup and removal of block device aliasing > (Christoph Hellwig) > > - Block device ioctl cleanups (Christoph Hellwig) > > - Removal of bdget()/blkdev_get() as exported API (Christoph Hellwig) > > - Disk change rework, avoid ->revalidate_disk() (Christoph Hellwig) > > - sbitmap improvements (Pavel Begunkov) > > - Hybrid polling fix (Pavel Begunkov) > > - bvec iteration improvements (Pavel Begunkov) > > - Zone revalidation fixes (Damien Le Moal) > > - blk-throttle limit fix (Yu Kuai) > > - Various little fixes > > Note that pulling this will throw a merge conflict due to the late > reverts of the md discard bits, and also a silent merge failure due to a > late fix (b7131ee0bac5) for 5.10 fixing a memory leak. Three in total, > they are: > > - drivers/md/md.c: this one does throw a merge error, fix is simply > removing md_submit_discard_bio(). > > - drivers/md/raid0.c: Remove the first argument to > trace_block_bio_remap(). > > - block/blk-cgroup.c: remove disk_put_part(part) in > blkcg_fill_root_iostats(). > > I've pushed out a for-5.11/block-merged branch that has these > resolutions in place, for reference. With the btrfs tree merged, you'll know need to edit fs/btrfs/zoned.c and apply the below incremental when this is pulled: diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 155545180046..c38846659019 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -165,7 +165,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device) if (!zone_info) return -ENOMEM; - nr_sectors = bdev->bd_part->nr_sects; + nr_sectors = bdev_nr_sectors(bdev); zone_sectors = bdev_zone_sectors(bdev); /* Check if it's power of 2 (see is_power_of_2) */ ASSERT(zone_sectors != 0 && (zone_sectors & (zone_sectors - 1)) == 0); @@ -505,7 +505,7 @@ int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw, return -EINVAL; zone_size = zone_sectors << SECTOR_SHIFT; zone_sectors_shift = ilog2(zone_sectors); - nr_sectors = bdev->bd_part->nr_sects; + nr_sectors = bdev_nr_sectors(bdev); nr_zones = nr_sectors >> zone_sectors_shift; sb_zone = sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror); @@ -603,7 +603,7 @@ int btrfs_reset_sb_log_zones(struct block_device *bdev, int mirror) zone_sectors = bdev_zone_sectors(bdev); zone_sectors_shift = ilog2(zone_sectors); - nr_sectors = bdev->bd_part->nr_sects; + nr_sectors = bdev_nr_sectors(bdev); nr_zones = nr_sectors >> zone_sectors_shift; sb_zone = sb_zone_number(zone_sectors_shift + SECTOR_SHIFT, mirror); -- Jens Axboe
