Skip to contentSkip to conversation

Block IO core bits for 3.6

GIT PULL Jens Axboe 1 participant 1 message Aug 1, 2012

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Later than usual, your merge window coincided with my vacation. I'm sure we both agree that this should never ever happen again. Kthx.

The most complicated part if this is the request allocation rework by Tejun, which has been queued up for a long time and has been in for-next ditto as well. There are a few commits from yesterday and today, mostly trivial and obvious fixes. So I'm pretty confident that it is sound. It's also smaller than usual.

It auto-merges directly into current master, so you should have no trouble with conflict resolutions.

Please pull:

git://git.kernel.dk/linux-block.git for-3.6/core

Mike Snitzer (1):
block: do not artificially constrain max_sectors for stacking drivers

Olof Johansson (1):

      block: uninitialized ioc->nr_tasks triggers WARN_ON

Tejun Heo (10):
blkcg: __blkg_lookup_create() doesn't need radix preload
blkcg: make root blkcg allocation use %GFP_KERNEL
mempool: add @gfp_mask to mempool_create_node()
block: drop custom queue draining used by scsi_transport_{iscsi|fc}
block: refactor get_request[_wait]()
block: allocate io_context upfront
blkcg: inline bio_blkcg() and friends
block: add q->nr_rqs[] and move q->rq.elvpriv to q->nr_rqs_elvpriv
block: prepare for multiple request_lists
blkcg: implement per-blkg request allocation

Vivek Goyal (1):
block: add partition resize function to blkpg ioctl

Yuanhan Liu (1):
block: remove dead func declaration

 Documentation/block/queue-sysfs.txt |   7 ++
 block/blk-cgroup.c                  | 139 +++++++++++++++---------
 block/blk-cgroup.h                  | 128 +++++++++++++++++++++-
 block/blk-core.c                    | 209 +++++++++++++++++++-----------------
 block/blk-ioc.c                     |   1 +
 block/blk-settings.c                |   3 +-
 block/blk-sysfs.c                   |  34 +++---
 block/blk-throttle.c                |   3 -
 block/blk.h                         |   4 +-
 block/bsg-lib.c                     |  53 ---------
 block/genhd.c                       |  20 +++-
 block/ioctl.c                       |  59 +++++++++-
 block/partition-generic.c           |   4 +-
 drivers/scsi/scsi_transport_fc.c    |  38 -------
 drivers/scsi/scsi_transport_iscsi.c |   2 +-
 include/linux/blkdev.h              |  53 +++++----
 include/linux/blkpg.h               |   1 +
 include/linux/bsg-lib.h             |   1 -
 include/linux/genhd.h               |  57 ++++++++++
 include/linux/mempool.h             |   3 +-
 mm/mempool.c                        |  12 ++-
 21 files changed, 530 insertions(+), 301 deletions(-)
Signature · 1 line
Jens Axboe