Skip to contentSkip to conversation

Block fixes for 3.15-rc1

GIT PULL Jens Axboe 1 participant 1 message Apr 10, 2014

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

A small collection of fixes that should go in before -rc1. The pull request contains:

- A two patch fix for a regression with block enabled tagging caused by a commit in the initial pull request. One patch is from Martin and ensures that SCSI doesn't truncate 64-bit block flags, the other one is from me and prevents us from double using struct request queuelist for both completion and busy tags. This caused anything from a boot crash for some, to crashes under load.

- A blk-mq fix for a potential soft stall when hot unplugging CPUs with busy IO.

- percpu_counter fix is listed in here, that caused a suspend issue with virtio-blk due to percpu counters having an inconsistent state during CPU removal. Andrew sent this in separately a few days ago, but it's here. JFYI.

- A few fixes for block integrity from Martin.

- A ratelimit fix for loop from Mike Galbraith, to avoid spewing too much in error cases.

Please pull!

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

----------------------------------------------------------------
Jens Axboe (3):
percpu_counter: fix bad counter state during suspend
blk-mq: fix potential stall during CPU unplug with IO pending
block: fix regression with block enabled tagging

Martin K. Petersen (4):
block: Fix for_each_bvec()
block: Fix integrity verification
block: Ensure we only enable integrity metadata for reads and writes
scsi: Make sure cmd_flags are 64-bit

Mike Galbraith (1):
drivers/block/loop.c: ratelimit error messages

 block/blk-core.c           |  2 +-
 block/blk-mq.c             |  8 ++++++--
 block/blk-softirq.c        | 17 ++++++-----------
 block/blk.h                |  2 +-
 block/elevator.c           |  2 ++
 drivers/block/loop.c       |  8 ++++----
 drivers/scsi/scsi_lib.c    |  4 ++--
 fs/bio-integrity.c         | 22 ++++++++++++----------
 include/linux/bio.h        |  6 +++---
 include/linux/blk_types.h  |  2 ++
 include/linux/blkdev.h     | 13 ++++++++++++-
 include/scsi/scsi_device.h |  4 ++--
 lib/percpu_counter.c       |  2 +-
 13 files changed, 54 insertions(+), 38 deletions(-)
Signature · 1 line
Jens Axboe