linux/drivers/block/drbd, branch v3.3-rc2

module_param: make bool parameters really bool (drivers & misc)

2012-01-12T23:02:20Z

module_param(bool) used to counter-intuitively take an int. In fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy trick. It's time to remove the int/unsigned int option. For this version it'll simply give a warning, but it'll break next kernel version. Acked-by: Mauro Carvalho Chehab Signed-off-by: Rusty Russell

Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block

2011-11-05T00:06:58Z

* 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits) block: don't call blk_drain_queue() if elevator is not up blk-throttle: use queue_is_locked() instead of lockdep_is_held() blk-throttle: Take blkcg->lock while traversing blkcg->policy_list blk-throttle: Free up policy node associated with deleted rule block: warn if tag is greater than real_max_depth. block: make gendisk hold a reference to its queue blk-flush: move the queue kick into blk-flush: fix invalid BUG_ON in blk_insert_flush block: Remove the control of complete cpu from bio. block: fix a typo in the blk-cgroup.h file block: initialize the bounce pool if high memory may be added later block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown block: drop @tsk from attempt_plug_merge() and explain sync rules block: make get_request[_wait]() fail if queue is dead block: reorganize throtl_get_tg() and blk_throtl_bio() block: reorganize queue draining block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg() block: pass around REQ_* flags instead of broken down booleans during request alloc/free block: move blk_throtl prototypes to block/blk.h block: fix genhd refcounting in blkio_policy_parse_and_set() ... Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion and making the request functions be of type "void" instead of "int" in - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c} - drivers/staging/zram/zram_drv.c

Merge branch 'v3.1-rc10' into for-3.2/core

2011-10-19T12:30:42Z

Conflicts: block/blk-core.c include/linux/blkdev.h Signed-off-by: Jens Axboe

Merge branch 'master' into for-next

2011-09-15T13:08:18Z

Fast-forward merge with Linus to be able to merge patches based on more recent version of the tree.

Remove unneeded version.h includes from drivers/block/

2011-09-15T12:57:06Z

It was pointed out by 'make versioncheck' that some includes of linux/version.h are not needed in drivers/block/. This patch removes them. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina

drbd: Use angle brackets for system includes

2011-09-15T12:02:57Z

Use the normal include style. Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina

drbd: Convert vmalloc/memset to vzalloc

2011-09-15T11:55:02Z

Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina

block: remove support for bio remapping from ->make_request

2011-09-12T10:12:01Z

There is very little benefit in allowing to let a ->make_request instance update the bios device and sector and loop around it in __generic_make_request when we can archive the same through calling generic_make_request from the driver and letting the loop in generic_make_request handle it. Note that various drivers got the return value from ->make_request and returned non-zero values for errors. Signed-off-by: Christoph Hellwig Acked-by: NeilBrown Signed-off-by: Jens Axboe

drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse

2011-08-02T10:43:49Z

The buffer 'sc.cpu_mask' is a kernel buffer. If bitmap_parse is used instead of __bitmap_parse the extra parameter that indicates a kernel buffer is not needed. Signed-off-by: H Hartley Sweeten Cc: Lars Ellenberg Cc: Philipp Reisner Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe

Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

2011-06-30T08:10:50Z