Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
Pull core block IO bits from Jens Axboe: "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." * 'for-3.6/core' of git://git.kernel.dk/linux-block: block: remove dead func declaration block: add partition resize function to blkpg ioctl block: uninitialized ioc->nr_tasks triggers WARN_ON block: do not artificially constrain max_sectors for stacking drivers blkcg: implement per-blkg request allocation block: prepare for multiple request_lists block: add q->nr_rqs[] and move q->rq.elvpriv to q->nr_rqs_elvpriv blkcg: inline bio_blkcg() and friends block: allocate io_context upfront block: refactor get_request[_wait]() block: drop custom queue draining used by scsi_transport_{iscsi|fc} mempool: add @gfp_mask to mempool_create_node() blkcg: make root blkcg allocation use %GFP_KERNEL blkcg: __blkg_lookup_create() doesn't need radix preload
No related branches found
No related tags found
Showing
- Documentation/block/queue-sysfs.txt 7 additions, 0 deletionsDocumentation/block/queue-sysfs.txt
- block/blk-cgroup.c 90 additions, 49 deletionsblock/blk-cgroup.c
- block/blk-cgroup.h 124 additions, 4 deletionsblock/blk-cgroup.h
- block/blk-core.c 111 additions, 98 deletionsblock/blk-core.c
- block/blk-ioc.c 1 addition, 0 deletionsblock/blk-ioc.c
- block/blk-settings.c 1 addition, 2 deletionsblock/blk-settings.c
- block/blk-sysfs.c 19 additions, 15 deletionsblock/blk-sysfs.c
- block/blk-throttle.c 0 additions, 3 deletionsblock/blk-throttle.c
- block/blk.h 3 additions, 1 deletionblock/blk.h
- block/bsg-lib.c 0 additions, 53 deletionsblock/bsg-lib.c
- block/genhd.c 15 additions, 5 deletionsblock/genhd.c
- block/ioctl.c 56 additions, 3 deletionsblock/ioctl.c
- block/partition-generic.c 3 additions, 1 deletionblock/partition-generic.c
- drivers/scsi/scsi_transport_fc.c 0 additions, 38 deletionsdrivers/scsi/scsi_transport_fc.c
- drivers/scsi/scsi_transport_iscsi.c 1 addition, 1 deletiondrivers/scsi/scsi_transport_iscsi.c
- include/linux/blkdev.h 32 additions, 21 deletionsinclude/linux/blkdev.h
- include/linux/blkpg.h 1 addition, 0 deletionsinclude/linux/blkpg.h
- include/linux/bsg-lib.h 0 additions, 1 deletioninclude/linux/bsg-lib.h
- include/linux/genhd.h 57 additions, 0 deletionsinclude/linux/genhd.h
- include/linux/mempool.h 2 additions, 1 deletioninclude/linux/mempool.h
Loading
Please register or sign in to comment