aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/as-iosched.c2
-rw-r--r--block/ll_rw_blk.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 1ec5df466708..3af31ed49a9c 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -892,7 +892,7 @@ static int as_can_break_anticipation(struct as_data *ad, struct as_rq *arq)
892} 892}
893 893
894/* 894/*
895 * as_can_anticipate indicates weather we should either run arq 895 * as_can_anticipate indicates whether we should either run arq
896 * or keep anticipating a better request. 896 * or keep anticipating a better request.
897 */ 897 */
898static int as_can_anticipate(struct as_data *ad, struct as_rq *arq) 898static int as_can_anticipate(struct as_data *ad, struct as_rq *arq)
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().