Skip to content

Commit

Permalink
Merge tag 'for-5.5/zoned-20191122' of git://git.kernel.dk/linux-block
Browse files Browse the repository at this point in the history
Pull zoned block device update from Jens Axboe:
 "Enhancements and improvements to the zoned device support"

* tag 'for-5.5/zoned-20191122' of git://git.kernel.dk/linux-block:
  scsi: sd_zbc: Remove set but not used variable 'buflen'
  block: rework zone reporting
  scsi: sd_zbc: Cleanup sd_zbc_alloc_report_buffer()
  null_blk: Add zone_nr_conv to features
  null_blk: clean up report zones
  null_blk: clean up the block device operations
  block: Remove partition support for zoned block devices
  block: Simplify report zones execution
  block: cleanup the !zoned case in blk_revalidate_disk_zones
  block: Enhance blk_revalidate_disk_zones()
  • Loading branch information
torvalds committed Nov 25, 2019
2 parents 323264e + a468168 commit 464a47f
Show file tree
Hide file tree
Showing 15 changed files with 427 additions and 702 deletions.
6 changes: 1 addition & 5 deletions block/blk-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -851,11 +851,7 @@ static inline int blk_partition_remap(struct bio *bio)
if (unlikely(bio_check_ro(bio, p)))
goto out;

/*
* Zone management bios do not have a sector count but they do have
* a start sector filled out and need to be remapped.
*/
if (bio_sectors(bio) || op_is_zone_mgmt(bio_op(bio))) {
if (bio_sectors(bio)) {
if (bio_check_eod(bio, part_nr_sects_read(p)))
goto out;
bio->bi_iter.bi_sector += p->start_sect;
Expand Down
Loading

0 comments on commit 464a47f

Please sign in to comment.