diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-16 09:53:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-16 09:53:48 -0700 |
| commit | c081474c184b34136e09e1e335f41356a11c7b68 (patch) | |
| tree | fe68ea74235af27d23cc375c94b4bf6baf99eb26 | |
| parent | 58125f95c62a44f12bb71c58ef70f0068d20c7a2 (diff) | |
| parent | c374f127e4ff17a318b9ae95a5bf65f370c2d0b1 (diff) | |
| download | linux-3.10-c081474c184b34136e09e1e335f41356a11c7b68.tar.gz linux-3.10-c081474c184b34136e09e1e335f41356a11c7b68.tar.bz2 linux-3.10-c081474c184b34136e09e1e335f41356a11c7b68.zip | |
Merge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block
| -rw-r--r-- | drivers/block/elevator.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c index 6b79b431462..89982925f9e 100644 --- a/drivers/block/elevator.c +++ b/drivers/block/elevator.c @@ -220,11 +220,6 @@ void elevator_exit(elevator_t *e) kfree(e); } -static int elevator_global_init(void) -{ - return 0; -} - int elv_merge(request_queue_t *q, struct request **req, struct bio *bio) { elevator_t *e = q->elevator; @@ -322,7 +317,7 @@ void __elv_add_request(request_queue_t *q, struct request *rq, int where, int nrq = q->rq.count[READ] + q->rq.count[WRITE] - q->in_flight; - if (nrq == q->unplug_thresh) + if (nrq >= q->unplug_thresh) __generic_unplug_device(q); } } else @@ -692,8 +687,6 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name) return len; } -module_init(elevator_global_init); - EXPORT_SYMBOL(elv_add_request); EXPORT_SYMBOL(__elv_add_request); EXPORT_SYMBOL(elv_requeue_request); |