[GIT,PULL] Block remainders for 5.3-rc1
diff mbox series

Message ID c8906a8f-347d-fde8-7f24-f3274fdda50d@kernel.dk
State New
Headers show
Series
  • [GIT,PULL] Block remainders for 5.3-rc1
Related show

Commit Message

Jens Axboe July 15, 2019, 7:47 p.m. UTC
Hi Linus,

A later pull request with some followup items. I had some vacation
coming up to the merge window, so certain things items were delayed a
bit. This pull request also contains fixes that came in within the last
few days of the merge window, which I didn't want to push right before
sending you a pull request.

This pull request contains:

- NVMe pull request, mostly fixes, but also a few minor items on the
  feature side that were timing constrained (Christoph et al)

- Report zones fixes (Damien)

- Removal of dead code (Damien)

- Turn on cgroup psi memstall (Josef)

- block cgroup MAINTAINERS entry (Konstantin)

- Flush init fix (Josef)

- blk-throttle low iops timing fix (Konstantin)

- nbd resize fixes (Mike)

- nbd 0 blocksize crash fix (Xiubo)

- block integrity error leak fix (Wenwen)

- blk-cgroup writeback and priority inheritance fixes (Tejun)

Note the latter renames wbc_account_io() to wbc_account_cgroup_owner()
to better describe what it does. F2FS and XFS both added another user of
this since the patch was done, see attached for the incremental needed
to fix that up. I didn't want to merge current -git for this, thought it
was cleaner if you just applied that as part of the merge.

Please pull!


  git://git.kernel.dk/linux-block.git tags/for-linus-20190715


----------------------------------------------------------------
Alan Mikhak (2):
      nvme-pci: don't create a read hctx mapping without read queues
      nvme-pci: check for NULL return from pci_alloc_p2pmem()

Bart Van Assche (3):
      nvmet: export I/O characteristics attributes in Identify
      nvme: add I/O characteristics fields
      nvme: set physical block size and optimal I/O size

Christoph Hellwig (2):
      nvme-pci: don't fall back to a 32-bit DMA mask
      nvme-pci: limit max_hw_sectors based on the DMA max mapping size

Colin Ian King (1):
      nvme-trace: fix spelling mistake "spcecific" -> "specific"

Damien Le Moal (8):
      block: Fix potential overflow in blk_report_zones()
      block: Remove unused definitions
      block: Fix elevator name declaration
      block: Disable write plugging for zoned block devices
      block: Allow mapping of vmalloc-ed buffers
      block: Kill gfp_t argument of blkdev_report_zones()
      sd_zbc: Fix report zones buffer allocation
      block: Limit zone array allocation size

Hannes Reinecke (3):
      nvme-multipath: factor out a nvme_path_is_disabled helper
      nvme-multipath: also check for a disabled path if there is a single sibling
      nvme-multipath: do not select namespaces which are about to be removed

James Smart (3):
      nvme-fcloop: fix inconsistent lock state warnings
      nvme-fcloop: resolve warnings on RCU usage and sleep warnings
      nvme-fc: fix module unloads while lports still pending

Jens Axboe (2):
      Merge branch 'nvme-5.3' of git://git.infradead.org/nvme into for-linus
      null_blk: fixup ->report_zones() for !CONFIG_BLK_DEV_ZONED

Josef Bacik (2):
      block: init flush rq ref count to 1
      blk-cgroup: turn on psi memstall stuff

Konstantin Khlebnikov (2):
      blk-throttle: fix zero wait time for iops throttled group
      MAINTAINERS: add entry for block io cgroup

Mike Christie (1):
      nbd: add netlink reconfigure resize support

Mikhail Skorzhinskii (3):
      nvmet: print a hint while rejecting NSID 0 or 0xffffffff
      nvme-tcp: set the STABLE_WRITES flag when data digests are enabled
      nvme-tcp: don't use sendpage for SLAB pages

Minwoo Im (1):
      nvme: fix NULL deref for fabrics options

Sagi Grimberg (1):
      nvme: fix regression upon hot device removal and insertion

Tejun Heo (5):
      cgroup, blkcg: Prepare some symbols for module and !CONFIG_CGROUP usages
      blkcg, writeback: Rename wbc_account_io() to wbc_account_cgroup_owner()
      blkcg, writeback: Add wbc->no_cgroup_owner
      blkcg, writeback: Implement wbc_blkcg_css()
      blkcg: implement REQ_CGROUP_PUNT

Tom Wu (1):
      nvme-trace: add delete completion and submission queue to admin cmds tracer

Wenwen Wang (1):
      block/bio-integrity: fix a memory leak bug

Xiubo Li (1):
      nbd: fix crash when the blksize is zero

YueHaibing (1):
      nvme-pci: make nvme_dev_pm_ops static

 Documentation/admin-guide/cgroup-v2.rst |   2 +-
 Documentation/block/biodoc.txt          |   5 --
 MAINTAINERS                             |  13 ++++
 block/bio-integrity.c                   |   8 ++-
 block/bio.c                             |  28 ++++++++-
 block/blk-cgroup.c                      |  66 +++++++++++++++++--
 block/blk-core.c                        |   6 +-
 block/blk-mq.c                          |   2 +-
 block/blk-mq.h                          |  32 ++++++++++
 block/blk-throttle.c                    |   9 +--
 block/blk-zoned.c                       |  69 +++++++++++---------
 drivers/block/nbd.c                     |  59 +++++++++++++----
 drivers/block/null_blk.h                |   5 +-
 drivers/block/null_blk_zoned.c          |   3 +-
 drivers/md/dm-flakey.c                  |   5 +-
 drivers/md/dm-linear.c                  |   5 +-
 drivers/md/dm-zoned-metadata.c          |  16 +++--
 drivers/md/dm.c                         |   6 +-
 drivers/nvme/host/core.c                |  43 +++++++++++--
 drivers/nvme/host/fc.c                  |  51 ++++++++++++++-
 drivers/nvme/host/multipath.c           |  18 ++++--
 drivers/nvme/host/nvme.h                |   1 +
 drivers/nvme/host/pci.c                 |  26 +++++---
 drivers/nvme/host/tcp.c                 |   9 ++-
 drivers/nvme/host/trace.c               |  28 ++++++++-
 drivers/nvme/target/admin-cmd.c         |   3 +
 drivers/nvme/target/configfs.c          |   4 +-
 drivers/nvme/target/fcloop.c            |  44 ++++++-------
 drivers/nvme/target/io-cmd-bdev.c       |  39 ++++++++++++
 drivers/nvme/target/nvmet.h             |   8 +++
 drivers/nvme/target/trace.c             |   2 +-
 drivers/scsi/sd.h                       |   3 +-
 drivers/scsi/sd_zbc.c                   | 108 ++++++++++++++++++++++----------
 fs/btrfs/extent_io.c                    |   4 +-
 fs/buffer.c                             |   2 +-
 fs/ext4/page-io.c                       |   2 +-
 fs/f2fs/data.c                          |   4 +-
 fs/f2fs/super.c                         |   4 +-
 fs/fs-writeback.c                       |  13 ++--
 fs/mpage.c                              |   2 +-
 include/linux/backing-dev.h             |   1 +
 include/linux/blk-cgroup.h              |  16 ++++-
 include/linux/blk_types.h               |  10 +++
 include/linux/blkdev.h                  |  14 +++--
 include/linux/cgroup.h                  |   1 +
 include/linux/device-mapper.h           |   3 +-
 include/linux/elevator.h                |  11 +---
 include/linux/nvme.h                    |  12 +++-
 include/linux/writeback.h               |  41 +++++++++---
 49 files changed, 658 insertions(+), 208 deletions(-)

Comments

pr-tracker-bot@kernel.org July 16, 2019, 4:35 a.m. UTC | #1
The pull request you sent on Mon, 15 Jul 2019 13:47:19 -0600:

> git://git.kernel.dk/linux-block.git tags/for-linus-20190715

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd

Thank you!

Patch
diff mbox series

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 323306630f93..4eb2f3920140 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -513,7 +513,7 @@  int f2fs_merge_page_bio(struct f2fs_io_info *fio)
 	}
 
 	if (fio->io_wbc)
-		wbc_account_io(fio->io_wbc, page, PAGE_SIZE);
+		wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE);
 
 	inc_page_count(fio->sbi, WB_DATA_TYPE(page));
 
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 761248ee2778..f16d5f196c6b 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -796,7 +796,7 @@  xfs_add_to_ioend(
 	}
 
 	wpc->ioend->io_size += len;
-	wbc_account_io(wbc, page, len);
+	wbc_account_cgroup_owner(wbc, page, len);
 }
 
 STATIC void