Skip to contentSkip to conversation

Block fixes for 4.5-rc

GIT PULL Jens Axboe 1 participant 1 message Feb 17, 2016

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

A collection of fixes from the past few weeks that should go into 4.5. This pull request contains:

- Overflow fix for sysfs discard show function from Alan.

- A stacking limit init fix for max_dev_sectors, so we don't end up artificially capping some use cases. From Keith.

- Have blk-mq proper end unstarted requests on a dying queue, instead of pushing that to the driver. From Keith.

- NVMe
- Update to Kconfig description for NVME_SCSI, since it was vague and having it on is important for some SUSE distros. From Christoph.
- Set of fixes from Keith, around surprise removal. Also kills the no-merge flag, so it supports merging.

- Set of fixes for lightnvm from Matias, Javier, and Wenwei.

- Fix null_blk oops when asked for lightnvm, but not available. From Matias.

- Copy-to-user EINTR fix from Hannes, fixing a case where SG_IO fails if interrupted by a signal.

- Two floppy fixes from Jiri, fixing signal handling and blocking open.

- A use-after-free fix for O_DIRECT, from Mike Krinkin.

- A block module ref count fix from Roman Pen.

- An fs IO wait accounting fix for O_DSYNC from Stephane Gasparini.

- Smaller reallo fix for xen-blkfront from Bob Liu.

- Removal of an unused struct member in the deadline IO scheduler, from Tahsin.

- Also from Tahsin, properly initialize inode struct members associated with cgroup writeback, if enabled.

- From Tejun, ensure that we keep the superblock pinned during cgroup writeback.

Please pull!

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

----------------------------------------------------------------
Alan (1):
blk: fix overflow in queue_discard_max_hw_show

Bob Liu (1):
xen/blkfront: realloc ring info in blkif_resume

Christoph Hellwig (1):
nvme: fix Kconfig description for BLK_DEV_NVME_SCSI

Hannes Reinecke (1):
bio: return EINTR if copying to user space got interrupted

Javier González (2):
lightnvm: warn if irqs are disabled in lock laddr
lightnvm: fix request intersection locking in rrpc

Jens Axboe (2):
Merge branch 'stable/for-jens-4.5' of git://git.kernel.org/.../konrad/xen into for-linus Merge branch 'for-4.5/for-jens' of git://git.kernel.org/.../jikos/linux-block into for-linus

Jiri Kosina (2):
floppy: fix lock_fdc() signal handling
floppy: refactor open() flags handling

Keith Busch (7):
block: Initialize max_dev_sectors to 0
blk-mq: End unstarted requests on dying queue
NVMe: Fix io incapable return values
NVMe: Allow request merges
NVMe: Requeue requests on suspended queues
NVMe: Poll device while still active during remove
NVMe: Rate limit nvme IO warnings

Matias Bjørling (3):
lightnvm: check overflow and correct mlc pairs
lightnvm: allow to force mm initialization
null_blk: oops when initializing without lightnvm

Mike Krinkin (1):
block: fix use-after-free in dio_bio_complete

Roman Pen (1):
block: fix module reference leak on put_disk() call for cgroups throttle

Stephane Gasparini (1):
kernel/fs: fix I/O wait not accounted for RW O_DSYNC

Tahsin Erdogan (2):
deadline: remove unused struct member
writeback: initialize inode members that track writeback history

Tejun Heo (1):
writeback: keep superblock pinned during cgroup writeback association switches

Wenwei Tao (1):
lightnvm: put bio before return

 block/bio.c                  |  9 ++++--
 block/blk-cgroup.c           |  9 ++++++
 block/blk-mq.c               |  6 ++--
 block/blk-settings.c         |  4 +--
 block/blk-sysfs.c            |  5 ++-
 block/deadline-iosched.c     |  3 --
 drivers/block/floppy.c       | 67 +++++++++++++++++++++------------------
 drivers/block/null_blk.c     |  8 +++--
 drivers/block/xen-blkfront.c | 74 +++++++++++++++++++++++++++-----------------
 drivers/lightnvm/core.c      | 25 +++++++++------
 drivers/lightnvm/rrpc.c      |  4 ++-
 drivers/lightnvm/rrpc.h      |  5 +--
 drivers/nvme/host/Kconfig    |  5 +--
 drivers/nvme/host/core.c     |  1 -
 drivers/nvme/host/lightnvm.c | 12 +++++--
 drivers/nvme/host/nvme.h     |  4 +--
 drivers/nvme/host/pci.c      | 13 ++++----
 fs/direct-io.c               |  2 +-
 fs/fs-writeback.c            | 15 ++++++---
 fs/inode.c                   |  6 ++++
 include/linux/lightnvm.h     |  4 +++
 21 files changed, 175 insertions(+), 106 deletions(-)
Signature · 1 line
Jens Axboe