diff options
Diffstat (limited to 'block/ll_rw_blk.c')
-rw-r--r-- | block/ll_rw_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 0603ab2f3692..c04422a502da 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -2745,7 +2745,7 @@ static int attempt_merge(request_queue_t *q, struct request *req, | |||
2745 | return 0; | 2745 | return 0; |
2746 | 2746 | ||
2747 | /* | 2747 | /* |
2748 | * not contigious | 2748 | * not contiguous |
2749 | */ | 2749 | */ |
2750 | if (req->sector + req->nr_sectors != next->sector) | 2750 | if (req->sector + req->nr_sectors != next->sector) |
2751 | return 0; | 2751 | return 0; |
@@ -3415,7 +3415,7 @@ static struct notifier_block blk_cpu_notifier = { | |||
3415 | * | 3415 | * |
3416 | * Description: | 3416 | * Description: |
3417 | * Ends all I/O on a request. It does not handle partial completions, | 3417 | * Ends all I/O on a request. It does not handle partial completions, |
3418 | * unless the driver actually implements this in its completionc callback | 3418 | * unless the driver actually implements this in its completion callback |
3419 | * through requeueing. Theh actual completion happens out-of-order, | 3419 | * through requeueing. Theh actual completion happens out-of-order, |
3420 | * through a softirq handler. The user must have registered a completion | 3420 | * through a softirq handler. The user must have registered a completion |
3421 | * callback through blk_queue_softirq_done(). | 3421 | * callback through blk_queue_softirq_done(). |