Skip to contentSkip to conversation

Block fixes for 4.1-rc

GIT PULL Jens Axboe 1 participant 1 message May 8, 2015

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

A collection of fixes since the merge window. This pull request contains:

- Fix for a double elevator module release, from Chao Yu. Ancient bug.

- The splice() MORE flag fix from Christophe Leroy.

- A fix for NVMe, fixing a patch that went in in the merge window. From Keith.

- Two fixes for blk-mq CPU hotplug handling, from Ming Lei.

- bdi vs blockdev lifetime fix from Neil Brown, fixing and oops in md.

- Two blk-mq fixes from Shaohua, fixing a race on queue stop and a bad merge issue with FUA writes.

- Division-by-zero fix for writeback from Tejun.

- A block bounce page accounting fix, making sure we inc/dec after bouncing so that pre/post IO pages match up. From Wang YanQing.

Please pull!

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

----------------------------------------------------------------
Chao Yu (1):
elevator: fix double release of elevator module

Christophe Leroy (1):
splice: sendfile() at once fails for big files

Keith Busch (1):
NVMe: Fix VPD B0 max sectors translation

Ming Lei (2):
blk-mq: fix race between timeout and CPU hotplug
blk-mq: fix CPU hotplug handling

NeilBrown (1):
block: destroy bdi before blockdev is unregistered.

Shaohua Li (2):
blk-mq: fix FUA request hang
blk-mq: don't lose requests if a stopped queue restarts

Tejun Heo (1):
writeback: use |1 instead of +1 to protect against div by zero

Wang YanQing (1):
block:bounce: fix call inc_|dec_zone_page_state on different pages confuse value of NR_BOUNCE

 block/blk-core.c          |  2 ++
 block/blk-mq.c            | 60 ++++++++++++++++++++++++++++-------------------
 block/blk-sysfs.c         |  2 --
 block/bounce.c            |  2 +-
 block/elevator.c          |  6 +----
 drivers/block/loop.c      |  2 +-
 drivers/block/nvme-scsi.c |  3 ++-
 drivers/md/md.c           |  4 ++--
 fs/splice.c               | 12 +++++++++-
 include/linux/blk_types.h |  2 +-
 mm/page-writeback.c       |  6 ++---
 11 files changed, 60 insertions(+), 41 deletions(-)
Signature · 1 line
Jens Axboe