Skip to contentSkip to conversation

Block fixes for 4.2-rc2

GIT PULL Jens Axboe 1 participant 1 message Jul 16, 2015

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

A collection of fixes from the last few weeks that should go into the current series. This pull request contains:

- Various fixes for the per-blkcg policy data, fixing regressions since 4.1 From Arianna and Tejun.

- Code cleanup for bcache closure macros from me. Really just flushing this out, it's been sitting in another branch for months.

- FIELD_SIZEOF cleanup from Maninder Singh.

- bio integrity oops fix from Mike.

- Timeout regression fix for blk-mq from Ming Lei.

Please pull!

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

----------------------------------------------------------------
Arianna Avanzini (1):
block/blk-cgroup.c: free per-blkcg data when freeing the blkcg

Jens Axboe (1):
bcache: don't embed 'return' statements in closure macros

Keith Busch (1):
NVMe: Reread partitions on metadata formats

Maninder Singh (1):
block: use FIELD_SIZEOF to calculate size of a field

Mike Snitzer (1):
bio integrity: do not assume bio_integrity_pool exists if bioset exists

Ming Lei (1):
blk-mq: set default timeout as 30 seconds

Tejun Heo (4):
blkcg: allow blkcg_pol_mutex to be grabbed from cgroup [file] methods
blkcg: blkcg_css_alloc() should grab blkcg_pol_mutex while iterating blkcg_policy[]
blkcg: implement all_blkcgs list
blkcg: fix blkcg_policy_data allocation bug

 block/bio-integrity.c       |   4 +-
 block/blk-cgroup.c          | 140 +++++++++++++++++++++++++-------------------
 block/blk-core.c            |   2 +-
 block/blk-mq.c              |   2 +-
 drivers/block/nvme-core.c   |  13 +++-
 drivers/md/bcache/closure.h |   3 -
 drivers/md/bcache/io.c      |   1 +
 drivers/md/bcache/journal.c |   2 +
 drivers/md/bcache/request.c |  14 ++++-
 include/linux/blk-cgroup.h  |  11 +---
 10 files changed, 113 insertions(+), 79 deletions(-)
Signature · 1 line
Jens Axboe