diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /block/as-iosched.c | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
| download | op-kernel-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.zip op-kernel-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.gz | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'block/as-iosched.c')
| -rw-r--r-- | block/as-iosched.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index 71f0abb..631f6f4 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c @@ -1339,12 +1339,12 @@ static int as_may_queue(struct request_queue *q, int rw) return ret; } -static void as_exit_queue(elevator_t *e) +static void as_exit_queue(struct elevator_queue *e) { struct as_data *ad = e->elevator_data; del_timer_sync(&ad->antic_timer); - kblockd_flush_work(&ad->antic_work); + cancel_work_sync(&ad->antic_work); BUG_ON(!list_empty(&ad->fifo_list[REQ_SYNC])); BUG_ON(!list_empty(&ad->fifo_list[REQ_ASYNC])); @@ -1409,7 +1409,7 @@ as_var_store(unsigned long *var, const char *page, size_t count) return count; } -static ssize_t est_time_show(elevator_t *e, char *page) +static ssize_t est_time_show(struct elevator_queue *e, char *page) { struct as_data *ad = e->elevator_data; int pos = 0; @@ -1427,7 +1427,7 @@ static ssize_t est_time_show(elevator_t *e, char *page) } #define SHOW_FUNCTION(__FUNC, __VAR) \ -static ssize_t __FUNC(elevator_t *e, char *page) \ +static ssize_t __FUNC(struct elevator_queue *e, char *page) \ { \ struct as_data *ad = e->elevator_data; \ return as_var_show(jiffies_to_msecs((__VAR)), (page)); \ @@ -1440,7 +1440,7 @@ SHOW_FUNCTION(as_write_batch_expire_show, ad->batch_expire[REQ_ASYNC]); #undef SHOW_FUNCTION #define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX) \ -static ssize_t __FUNC(elevator_t *e, const char *page, size_t count) \ +static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count) \ { \ struct as_data *ad = e->elevator_data; \ int ret = as_var_store(__PTR, (page), count); \ |
