diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:20:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:20:05 -0500 |
commit | 1dff81f20cd55ffa5a8ee984da70ce0b99d29606 (patch) | |
tree | 06eb07bda250abfa8a78c3141db56862c8c7cf98 /block/deadline-iosched.c | |
parent | 179475a3b46f86e2d06f83e2312218ac3f0cf3a7 (diff) | |
parent | d3f761104b097738932afcc310fbbbbfb007ef92 (diff) |
Merge branch 'for-2.6.29' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.29' of git://git.kernel.dk/linux-2.6-block: (43 commits)
bio: get rid of bio_vec clearing
bounce: don't rely on a zeroed bio_vec list
cciss: simplify parameters to deregister_disk function
cfq-iosched: fix race between exiting queue and exiting task
loop: Do not call loop_unplug for not configured loop device.
loop: Flush possible running bios when loop device is released.
alpha: remove dead BIO_VMERGE_BOUNDARY
Get rid of CONFIG_LSF
block: make blk_softirq_init() static
block: use min_not_zero in blk_queue_stack_limits
block: add one-hit cache for disk partition lookup
cfq-iosched: remove limit of dispatch depth of max 4 times quantum
nbd: tell the block layer that it is not a rotational device
block: get rid of elevator_t typedef
aio: make the lookup_ioctx() lockless
bio: add support for inlining a number of bio_vecs inside the bio
bio: allow individual slabs in the bio_set
bio: move the slab pointer inside the bio_set
bio: only mempool back the largest bio_vec slab cache
block: don't use plugging on SSD devices
...
Diffstat (limited to 'block/deadline-iosched.c')
-rw-r--r-- | block/deadline-iosched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index fd311179f44c..c4d991d4adef 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c | |||
@@ -334,7 +334,7 @@ static int deadline_queue_empty(struct request_queue *q) | |||
334 | && list_empty(&dd->fifo_list[READ]); | 334 | && list_empty(&dd->fifo_list[READ]); |
335 | } | 335 | } |
336 | 336 | ||
337 | static void deadline_exit_queue(elevator_t *e) | 337 | static void deadline_exit_queue(struct elevator_queue *e) |
338 | { | 338 | { |
339 | struct deadline_data *dd = e->elevator_data; | 339 | struct deadline_data *dd = e->elevator_data; |
340 | 340 | ||
@@ -387,7 +387,7 @@ deadline_var_store(int *var, const char *page, size_t count) | |||
387 | } | 387 | } |
388 | 388 | ||
389 | #define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ | 389 | #define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ |
390 | static ssize_t __FUNC(elevator_t *e, char *page) \ | 390 | static ssize_t __FUNC(struct elevator_queue *e, char *page) \ |
391 | { \ | 391 | { \ |
392 | struct deadline_data *dd = e->elevator_data; \ | 392 | struct deadline_data *dd = e->elevator_data; \ |
393 | int __data = __VAR; \ | 393 | int __data = __VAR; \ |
@@ -403,7 +403,7 @@ SHOW_FUNCTION(deadline_fifo_batch_show, dd->fifo_batch, 0); | |||
403 | #undef SHOW_FUNCTION | 403 | #undef SHOW_FUNCTION |
404 | 404 | ||
405 | #define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ | 405 | #define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ |
406 | static ssize_t __FUNC(elevator_t *e, const char *page, size_t count) \ | 406 | static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count) \ |
407 | { \ | 407 | { \ |
408 | struct deadline_data *dd = e->elevator_data; \ | 408 | struct deadline_data *dd = e->elevator_data; \ |
409 | int __data; \ | 409 | int __data; \ |