mbox series

[GIT,PULL] Followup block fixes for this merge window

Message ID 4fb0811b-af58-60db-1c27-ef367876c491@kernel.dk (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL] Followup block fixes for this merge window | expand

Pull-request

git://git.kernel.dk/linux-block.git tags/block-5.12-2021-02-27

Message

Jens Axboe Feb. 27, 2021, 7:52 p.m. UTC
Hi Linus,

A few stragglers (and one due to me missing it originally), and fixes
for changes in this merge window mostly. In particular:

- blktrace cleanups (Chaitanya, Greg)

- Kill dead blk_pm_* functions (Bart)

- Fixes for the bio alloc changes (Christoph)

- Fix for the partition changes (Christoph, Ming)

- Fix for turning off iopoll with polled IO inflight (Jeffle)

- nbd disconnect fix (Josef)

- loop fsync error fix (Mauricio)

- kyber update depth fix (Yang)

- max_sectors alignment fix (Mikulas)

- Add bio_max_segs helper (Matthew)

Please pull!


The following changes since commit 31caf8b2a847214be856f843e251fc2ed2cd1075:

  Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (2021-02-21 17:23:56 -0800)

are available in the Git repository at:

  git://git.kernel.dk/linux-block.git tags/block-5.12-2021-02-27

for you to fetch changes up to 5f7136db82996089cdfb2939c7664b29e9da141d:

  block: Add bio_max_segs (2021-02-26 15:49:51 -0700)

----------------------------------------------------------------
block-5.12-2021-02-27

----------------------------------------------------------------
Bart Van Assche (1):
      block: Remove unused blk_pm_*() function definitions

Chaitanya Kulkarni (6):
      block: remove superfluous param in blk_fill_rwbs()
      blktrace: add blk_fill_rwbs documentation comment
      blktrace: fix blk_rq_issue documentation
      blktrace: fix blk_rq_merge documentation
      block: get rid of the trace rq insert wrapper
      blktrace: fix documentation for blk_fill_rw()

Christoph Hellwig (6):
      block: don't skip empty device in in disk_uevent
      block: reopen the device in blkdev_reread_part
      block-crypto-fallback: use a bio_set for splitting bios
      block: fix bounce_clone_bio for passthrough bios
      block: remove the gfp_mask argument to bounce_clone_bio
      block: memory allocations in bounce_clone_bio must not fail

Greg Kroah-Hartman (1):
      blktrace: remove debugfs file dentries from struct blk_trace

Jeffle Xu (1):
      block: fix potential IO hang when turning off io_poll

Josef Bacik (1):
      nbd: handle device refs for DESTROY_ON_DISCONNECT properly

Matthew Wilcox (Oracle) (1):
      block: Add bio_max_segs

Mauricio Faria de Oliveira (1):
      loop: fix I/O error on fsync() in detached loop devices

Mikulas Patocka (1):
      blk-settings: align max_sectors on "logical_block_size" boundary

Ming Lei (1):
      block: fix logging on capacity change

Yang Yang (1):
      kyber: introduce kyber_depth_updated()

 block/bfq-iosched.c                 |  4 +++-
 block/blk-core.c                    |  1 +
 block/blk-crypto-fallback.c         | 12 ++++++++++--
 block/blk-map.c                     |  4 +---
 block/blk-mq-sched.c                |  6 ------
 block/blk-mq-sched.h                |  1 -
 block/blk-pm.h                      | 38 -------------------------------------
 block/blk-settings.c                | 12 ++++++++++++
 block/blk-sysfs.c                   |  7 +++++--
 block/bounce.c                      | 24 +++++++++++------------
 block/genhd.c                       |  4 ++--
 block/ioctl.c                       | 21 +++++++++++++-------
 block/kyber-iosched.c               | 33 ++++++++++++++++----------------
 block/mq-deadline.c                 |  4 +++-
 drivers/block/loop.c                |  3 +++
 drivers/block/nbd.c                 | 32 ++++++++++++++++++-------------
 drivers/block/xen-blkback/blkback.c |  4 +---
 drivers/md/dm-io.c                  |  4 ++--
 drivers/md/dm-log-writes.c          | 10 +++++-----
 drivers/nvme/target/io-cmd-bdev.c   |  8 ++++----
 drivers/nvme/target/passthru.c      |  4 ++--
 drivers/target/target_core_iblock.c |  9 +++------
 drivers/target/target_core_pscsi.c  |  2 +-
 fs/block_dev.c                      | 10 +++++-----
 fs/direct-io.c                      |  2 +-
 fs/erofs/data.c                     |  4 +---
 fs/ext4/readpage.c                  |  3 +--
 fs/f2fs/data.c                      |  3 +--
 fs/f2fs/node.c                      |  2 +-
 fs/iomap/buffered-io.c              |  4 ++--
 fs/mpage.c                          |  4 +---
 fs/nfs/blocklayout/blocklayout.c    |  6 +++---
 fs/xfs/xfs_bio_io.c                 |  2 +-
 fs/xfs/xfs_buf.c                    |  4 ++--
 include/linux/bio.h                 |  7 ++++++-
 include/linux/blkdev.h              |  1 -
 include/linux/blktrace_api.h        |  4 +---
 include/trace/events/bcache.h       | 10 +++++-----
 include/trace/events/block.h        | 20 +++++++++----------
 kernel/trace/blktrace.c             | 20 ++++++++++++-------
 40 files changed, 173 insertions(+), 180 deletions(-)

Comments

pr-tracker-bot@kernel.org Feb. 28, 2021, 8:14 p.m. UTC | #1
The pull request you sent on Sat, 27 Feb 2021 12:52:51 -0700:

> git://git.kernel.dk/linux-block.git tags/block-5.12-2021-02-27

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3ab6608e66b16159c3a3c2d7015b9c11cd3396c1

Thank you!
Damien Le Moal March 1, 2021, 1:49 a.m. UTC | #2
On 2021/02/28 4:55, Jens Axboe wrote:
> Hi Linus,
> 
> A few stragglers (and one due to me missing it originally), and fixes
> for changes in this merge window mostly. In particular:
> 
> - blktrace cleanups (Chaitanya, Greg)
> 
> - Kill dead blk_pm_* functions (Bart)
> 
> - Fixes for the bio alloc changes (Christoph)
> 
> - Fix for the partition changes (Christoph, Ming)
> 
> - Fix for turning off iopoll with polled IO inflight (Jeffle)
> 
> - nbd disconnect fix (Josef)
> 
> - loop fsync error fix (Mauricio)
> 
> - kyber update depth fix (Yang)
> 
> - max_sectors alignment fix (Mikulas)
> 
> - Add bio_max_segs helper (Matthew)

Hi Jens,

I think you forgot to add the patch for reverting commit 0fe37724f8e7 ("block:
fix bd_size_lock use"). Or will that got into another PR ?

Thanks !

> 
> Please pull!
> 
> 
> The following changes since commit 31caf8b2a847214be856f843e251fc2ed2cd1075:
> 
>   Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (2021-02-21 17:23:56 -0800)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.dk/linux-block.git tags/block-5.12-2021-02-27
> 
> for you to fetch changes up to 5f7136db82996089cdfb2939c7664b29e9da141d:
> 
>   block: Add bio_max_segs (2021-02-26 15:49:51 -0700)
> 
> ----------------------------------------------------------------
> block-5.12-2021-02-27
> 
> ----------------------------------------------------------------
> Bart Van Assche (1):
>       block: Remove unused blk_pm_*() function definitions
> 
> Chaitanya Kulkarni (6):
>       block: remove superfluous param in blk_fill_rwbs()
>       blktrace: add blk_fill_rwbs documentation comment
>       blktrace: fix blk_rq_issue documentation
>       blktrace: fix blk_rq_merge documentation
>       block: get rid of the trace rq insert wrapper
>       blktrace: fix documentation for blk_fill_rw()
> 
> Christoph Hellwig (6):
>       block: don't skip empty device in in disk_uevent
>       block: reopen the device in blkdev_reread_part
>       block-crypto-fallback: use a bio_set for splitting bios
>       block: fix bounce_clone_bio for passthrough bios
>       block: remove the gfp_mask argument to bounce_clone_bio
>       block: memory allocations in bounce_clone_bio must not fail
> 
> Greg Kroah-Hartman (1):
>       blktrace: remove debugfs file dentries from struct blk_trace
> 
> Jeffle Xu (1):
>       block: fix potential IO hang when turning off io_poll
> 
> Josef Bacik (1):
>       nbd: handle device refs for DESTROY_ON_DISCONNECT properly
> 
> Matthew Wilcox (Oracle) (1):
>       block: Add bio_max_segs
> 
> Mauricio Faria de Oliveira (1):
>       loop: fix I/O error on fsync() in detached loop devices
> 
> Mikulas Patocka (1):
>       blk-settings: align max_sectors on "logical_block_size" boundary
> 
> Ming Lei (1):
>       block: fix logging on capacity change
> 
> Yang Yang (1):
>       kyber: introduce kyber_depth_updated()
> 
>  block/bfq-iosched.c                 |  4 +++-
>  block/blk-core.c                    |  1 +
>  block/blk-crypto-fallback.c         | 12 ++++++++++--
>  block/blk-map.c                     |  4 +---
>  block/blk-mq-sched.c                |  6 ------
>  block/blk-mq-sched.h                |  1 -
>  block/blk-pm.h                      | 38 -------------------------------------
>  block/blk-settings.c                | 12 ++++++++++++
>  block/blk-sysfs.c                   |  7 +++++--
>  block/bounce.c                      | 24 +++++++++++------------
>  block/genhd.c                       |  4 ++--
>  block/ioctl.c                       | 21 +++++++++++++-------
>  block/kyber-iosched.c               | 33 ++++++++++++++++----------------
>  block/mq-deadline.c                 |  4 +++-
>  drivers/block/loop.c                |  3 +++
>  drivers/block/nbd.c                 | 32 ++++++++++++++++++-------------
>  drivers/block/xen-blkback/blkback.c |  4 +---
>  drivers/md/dm-io.c                  |  4 ++--
>  drivers/md/dm-log-writes.c          | 10 +++++-----
>  drivers/nvme/target/io-cmd-bdev.c   |  8 ++++----
>  drivers/nvme/target/passthru.c      |  4 ++--
>  drivers/target/target_core_iblock.c |  9 +++------
>  drivers/target/target_core_pscsi.c  |  2 +-
>  fs/block_dev.c                      | 10 +++++-----
>  fs/direct-io.c                      |  2 +-
>  fs/erofs/data.c                     |  4 +---
>  fs/ext4/readpage.c                  |  3 +--
>  fs/f2fs/data.c                      |  3 +--
>  fs/f2fs/node.c                      |  2 +-
>  fs/iomap/buffered-io.c              |  4 ++--
>  fs/mpage.c                          |  4 +---
>  fs/nfs/blocklayout/blocklayout.c    |  6 +++---
>  fs/xfs/xfs_bio_io.c                 |  2 +-
>  fs/xfs/xfs_buf.c                    |  4 ++--
>  include/linux/bio.h                 |  7 ++++++-
>  include/linux/blkdev.h              |  1 -
>  include/linux/blktrace_api.h        |  4 +---
>  include/trace/events/bcache.h       | 10 +++++-----
>  include/trace/events/block.h        | 20 +++++++++----------
>  kernel/trace/blktrace.c             | 20 ++++++++++++-------
>  40 files changed, 173 insertions(+), 180 deletions(-)
>
Jens Axboe March 1, 2021, 2:48 a.m. UTC | #3
On 2/28/21 6:49 PM, Damien Le Moal wrote:
> On 2021/02/28 4:55, Jens Axboe wrote:
>> Hi Linus,
>>
>> A few stragglers (and one due to me missing it originally), and fixes
>> for changes in this merge window mostly. In particular:
>>
>> - blktrace cleanups (Chaitanya, Greg)
>>
>> - Kill dead blk_pm_* functions (Bart)
>>
>> - Fixes for the bio alloc changes (Christoph)
>>
>> - Fix for the partition changes (Christoph, Ming)
>>
>> - Fix for turning off iopoll with polled IO inflight (Jeffle)
>>
>> - nbd disconnect fix (Josef)
>>
>> - loop fsync error fix (Mauricio)
>>
>> - kyber update depth fix (Yang)
>>
>> - max_sectors alignment fix (Mikulas)
>>
>> - Add bio_max_segs helper (Matthew)
> 
> Hi Jens,
> 
> I think you forgot to add the patch for reverting commit 0fe37724f8e7 ("block:
> fix bd_size_lock use"). Or will that got into another PR ?

Yes, please re-send it and it'll make -rc2.