From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 May 2023 15:28:58 +0000 (-0700)
Subject: Merge tag 'for-6.4/block-2023-05-06' of git://git.kernel.dk/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a3b111b046f6ce5dff168af203daf2f46f3afb29;p=linux.git

Merge tag 'for-6.4/block-2023-05-06' of git://git.kernel.dk/linux

Pull more block updates from Jens Axboe:

 - MD pull request via Song:
      - Improve raid5 sequential IO performance on spinning disks, which
        fixes a regression since v6.0 (Jan Kara)
      - Fix bitmap offset types, which fixes an issue introduced in this
        merge window (Jonathan Derrick)

 - Cleanup of hweight type used for cgroup writeback (Maxim)

 - Fix a regression with the "has_submit_bio" changes across partitions
   (Ming)

 - Cleanup of QUEUE_FLAG_ADD_RANDOM clearing.

   We used to set this flag on queues non blk-mq queues, and hence some
   drivers clear it unconditionally. Since all of these have since been
   converted to true blk-mq drivers, drop the useless clear as the bit
   is not set (Chaitanya)

 - Fix the flags being set in a bio for a flush for drbd (Christoph)

 - Cleanup and deduplication of the code handling setting block device
   capacity (Damien)

 - Fix for ublk handling IO timeouts (Ming)

 - Fix for a regression in blk-cgroup teardown (Tao)

 - NBD documentation and code fixes (Eric)

 - Convert blk-integrity to using device_attributes rather than a second
   kobject to manage lifetimes (Thomas)

* tag 'for-6.4/block-2023-05-06' of git://git.kernel.dk/linux:
  ublk: add timeout handler
  drbd: correctly submit flush bio on barrier
  mailmap: add mailmap entries for Jens Axboe
  block: Skip destroyed blkg when restart in blkg_destroy_all()
  writeback: fix call of incorrect macro
  md: Fix bitmap offset type in sb writer
  md/raid5: Improve performance for sequential IO
  docs nbd: userspace NBD now favors github over sourceforge
  block nbd: use req.cookie instead of req.handle
  uapi nbd: add cookie alias to handle
  uapi nbd: improve doc links to userspace spec
  blk-integrity: register sysfs attributes on struct device
  blk-integrity: convert to struct device_attribute
  blk-integrity: use sysfs_emit
  block/drivers: remove dead clear of random flag
  block: sync part's ->bd_has_submit_bio with disk's
  block: Cleanup set_capacity()/bdev_set_nr_sectors()
---

a3b111b046f6ce5dff168af203daf2f46f3afb29
diff --cc block/genhd.c
index 90c402771bb57,9fa4a7cd978c8..1cb489b927d50
--- a/block/genhd.c
+++ b/block/genhd.c
@@@ -558,10 -545,9 +549,8 @@@ out_put_slave_dir
  	disk->slave_dir = NULL;
  out_put_holder_dir:
  	kobject_put(disk->part0->bd_holder_dir);
- out_del_integrity:
- 	blk_integrity_del(disk);
  out_del_block_link:
 -	if (!sysfs_deprecated)
 -		sysfs_remove_link(block_depr, dev_name(ddev));
 +	sysfs_remove_link(block_depr, dev_name(ddev));
  out_device_del:
  	device_del(ddev);
  out_free_ext_minor: