lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block

Browse Source
This commit is contained in:
Linus Torvalds
2005-06-16 09:53:48 -07:00
parent 58125f95c6 c374f127e4
commit c081474c18
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/block/elevator.c
View File

@@ -220,11 +220,6 @@ void elevator_exit(elevator_t *e)
kfree(e); kfree(e);
} }
static int elevator_global_init(void)
{
return 0;
}
int elv_merge(request_queue_t *q, struct request **req, struct bio *bio) int elv_merge(request_queue_t *q, struct request **req, struct bio *bio)
{ {
elevator_t *e = q->elevator; 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] int nrq = q->rq.count[READ] + q->rq.count[WRITE]
- q->in_flight; - q->in_flight;
if (nrq == q->unplug_thresh) if (nrq >= q->unplug_thresh)
__generic_unplug_device(q); __generic_unplug_device(q);
} }
} else } else
@@ -692,8 +687,6 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
return len; return len;
} }
module_init(elevator_global_init);
EXPORT_SYMBOL(elv_add_request); EXPORT_SYMBOL(elv_add_request);
EXPORT_SYMBOL(__elv_add_request); EXPORT_SYMBOL(__elv_add_request);
EXPORT_SYMBOL(elv_requeue_request); EXPORT_SYMBOL(elv_requeue_request);