Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block
+1
-8
+1
-8
drivers/block/elevator.c
+1
-8
drivers/block/elevator.c
···
220
220
kfree(e);
221
221
}
222
222
223
-
static int elevator_global_init(void)
224
-
{
225
-
return 0;
226
-
}
227
-
228
223
int elv_merge(request_queue_t *q, struct request **req, struct bio *bio)
229
224
{
230
225
elevator_t *e = q->elevator;
···
317
322
int nrq = q->rq.count[READ] + q->rq.count[WRITE]
318
323
- q->in_flight;
319
324
320
-
if (nrq == q->unplug_thresh)
325
+
if (nrq >= q->unplug_thresh)
321
326
__generic_unplug_device(q);
322
327
}
323
328
} else
···
686
691
len += sprintf(len+name, "\n");
687
692
return len;
688
693
}
689
-
690
-
module_init(elevator_global_init);
691
694
692
695
EXPORT_SYMBOL(elv_add_request);
693
696
EXPORT_SYMBOL(__elv_add_request);