Skip to contentSkip to conversation

Block updates for 3.17-rc

GIT PULL Jens Axboe 1 participant 1 message Sep 12, 2014

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

A small collection of fixes for the current rc series. It contains:

- Two small blk-mq patches from Rob Elliott, cleaning up error case at init time.

- A fix from Ming Lei, fixing SG merging for blk-mq where QUEUE_FLAG_SG_NO_MERGE is the default.

- A dev_t minor lifetime fix from Keith, fixing an issue where a minor might be reused before all references to it were gone.

- Fix from Alan Stern where an unbalanced queue bypass caused SCSI some headaches when it does a series of add/del on devices without fully registrering the queue.

- A fix from me for improving the scaling of tag depth in blk-mq if we are short on memory.

Please pull!

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

for you to fetch changes up to a516440542afcb9647f88d12c35640baf02d07ea:

blk-mq: scale depth and rq map appropriate if low on memory (2014-09-10 09:02:03 -0600)

----------------------------------------------------------------
Alan Stern (1):
Block: fix unbalanced bypass-disable in blk_register_queue

Jens Axboe (1):
blk-mq: scale depth and rq map appropriate if low on memory

Keith Busch (1):
block: Fix dev_t minor allocation lifetime

Ming Lei (1):
blk-merge: fix blk_recount_segments

Robert Elliott (2):
blk-mq: pass along blk_mq_alloc_tag_set return values
blk-mq: cleanup after blk_mq_init_rq_map failures

 block/blk-merge.c                 | 17 +++++---
 block/blk-mq.c                    | 91 +++++++++++++++++++++++++++++++--------
 block/blk-sysfs.c                 |  6 ++-
 block/genhd.c                     | 24 ++++++-----
 block/partition-generic.c         |  2 +-
 drivers/block/mtip32xx/mtip32xx.c |  1 -
 drivers/block/null_blk.c          | 29 +++++++++----
 7 files changed, 123 insertions(+), 47 deletions(-)
Signature · 1 line
Jens Axboe