Skip to contentSkip to conversation

Block driver updates for 3.19

GIT PULL Jens Axboe 1 participant 1 message Dec 13, 2014

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Below is the block driver pull request for 3.19, it sits on top of the core pull request submitted yesterday. It contains:

- NVMe updates

- The blk-mq conversion from Matias (and others)

- A stack of NVMe bug fixes from the nvme tree, mostly from Keith.

- Various bug fixes from me, fixing issues in both the blk-mq conversion and generic bugs.

- Abort and CPU online fix from Sam.

- Hot add/remove fix from Indraneel.

- A couple of drbd fixes from the drbd team (Andreas, Lars, Philipp)

- With the generic IO stat accounting from 3.19/core, converting md, bcache, and rsxx to use those. From Gu Zheng.

- Boundary check for queue/irq mode for null_blk from Matias. Fixes cases where invalid values could be given, causing the device to hang.

- The xen blkfront pull request, with two bug fixes from Vitaly.

Please pull!

git://git.kernel.dk/linux-block.git for-3.19/drivers

----------------------------------------------------------------
Andreas Gruenbacher (2):
drbd: Minor cleanups
drbd: Only use drbd_msg_put_info() in drbd_nl.c

Andreea-Cristina Bernat (1):
nvme: Replace rcu_assign_pointer() with RCU_INIT_POINTER()

Dan Carpenter (1):
NVMe: blk_mq_alloc_request() returns error pointers

Dan McLeran (2):
NVMe: Change nvme_enable_ctrl to set EN and manage CC thru ctrl_config.
NVMe: Add shutdown timeout as module parameter.

Gu Zheng (4):
md/bcache: use generic io stats accounting functions to simplify io stat accounting
drbd: use generic io stats accounting functions to simplify io stat accounting
md: use generic io stats accounting functions to simplify io stat accounting block/rsxx: use generic io stats accounting functions to simplify io stat accounting

Indraneel M (1):
NVMe: Fix FS mount issue (hot-remove followed by hot-add)

Jens Axboe (13):
Merge branch 'for-3.19/core' into for-3.19/drivers
NVMe: replace blk_put_request() with blk_mq_free_request()
NVMe: nvme_submit_async_admin_req() must use atomic rq allocation
NVMe: enable IO stats by default
Merge branch 'master' into for-3.19/drivers
NVMe: make setup work for devices that don't do INTx
NVMe: add ->exit_hctx() hook
NVMe: fail pci initialization if the device doesn't have any BARs
Merge branch 'for-3.19/core' into for-3.19/drivers
NVMe: fix error return checking from blk_mq_alloc_request()
Merge branch 'for-jens-3.19' of git://git.kernel.org/.../konrad/xen into for-3.19/drivers
NVMe: fix retry/error logic in nvme_queue_rq()
NVMe: fix race condition in nvme_submit_sync_cmd()

Joe Perches (1):
block: Use dma_zalloc_coherent

Keith Busch (22):
NVMe: Async event request
NVMe: Mismatched host/device page size support
NVMe: Handling devices incapable of I/O
NVMe: Use pci_stop_and_remove_bus_device_locked()
NVMe: Whitespace fixes
NVMe: Skip orderly shutdown on failed devices
NVMe: Call nvme_free_queue directly
NVMe: Fix filesystem sync deadlock on removal
NVMe: Reference count pci device
NVMe: Remove duplicate compat SG_IO code
NVMe: Fix SG_IO status values
NVMe: Translate NVMe status to errno
NVMe: Fix nvmeq waitqueue entry initialization
NVMe: Add revalidate_disk callback
NVMe: Passthrough IOCTL for IO commands
NVMe: Updates for 1.1 spec
NVMe: Fix device probe waiting on kthread
NVMe: Clear QUEUE_FLAG_STACKABLE
NVMe: Do not open disks that are being deleted
NVMe: Do not over allocate for discard requests
NVMe: Update module version major number
NVMe: Fix command setup on IO retry

Lars Ellenberg (2):
drbd: fix resync throttling initialization
drbd: merge_bvec_fn: properly remap bvm->bi_bdev

Matias Bjorling (1):
null_blk: boundary check queue_mode and irqmode

Matias Bjørling (1):
NVMe: Convert to blk-mq

Matthew Wilcox (1):
NVMe: Update list of status codes

Philipp Reisner (3):
drbd: fix race between role change and handshake
drbd: Fix state change in case of connection timeout
drbd: Remove an useless copy of kernel_setsockopt()

Sam Bradshaw (2):
NVMe: Correctly handle IOCTL_SUBMIT_IO when cpus > online queues
NVMe: fix freeing of wrong request in abort path

Vitaly Kuznetsov (2):
xen/blkfront: improve protection against issuing unsupported REQ_FUA xen/blkfront: remove redundant flush_op

kbuild test robot (1):
NVMe: __nvme_submit_admin_cmd() can be static

 drivers/block/drbd/drbd_actlog.c   |    3 +-
 drivers/block/drbd/drbd_int.h      |   39 +-
 drivers/block/drbd/drbd_main.c     |   23 +-
 drivers/block/drbd/drbd_nl.c       |   64 +-
 drivers/block/drbd/drbd_receiver.c |    2 +-
 drivers/block/drbd/drbd_req.c      |   25 +-
 drivers/block/drbd/drbd_state.c    |   42 +-
 drivers/block/drbd/drbd_state.h    |    5 +
 drivers/block/drbd/drbd_worker.c   |    5 +-
 drivers/block/null_blk.c           |   42 +-
 drivers/block/nvme-core.c          | 1594 +++++++++++++++++-------------------
 drivers/block/nvme-scsi.c          |  162 +---
 drivers/block/rsxx/dev.c           |   29 +-
 drivers/block/xen-blkfront.c       |   65 +-
 drivers/md/bcache/request.c        |   23 +-
 drivers/md/dm.c                    |   13 +-
 drivers/md/md.c                    |    6 +-
 include/linux/drbd.h               |    2 +-
 include/linux/nvme.h               |   18 +-
 include/uapi/linux/nvme.h          |   46 +-
 20 files changed, 1009 insertions(+), 1199 deletions(-)
Signature · 1 line
Jens Axboe