diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /block | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-cgroup.c | 4 | ||||
-rw-r--r-- | block/blk-core.c | 2 | ||||
-rw-r--r-- | block/blk-throttle.c | 2 | ||||
-rw-r--r-- | block/blk.h | 2 | ||||
-rw-r--r-- | block/cfq-iosched.c | 2 | ||||
-rw-r--r-- | block/genhd.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 2bef5705ce24..f0605ab2a761 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -868,7 +868,7 @@ static void blkio_update_policy_rule(struct blkio_policy_node *oldpn, | |||
868 | } | 868 | } |
869 | 869 | ||
870 | /* | 870 | /* |
871 | * Some rules/values in blkg have changed. Propogate those to respective | 871 | * Some rules/values in blkg have changed. Propagate those to respective |
872 | * policies. | 872 | * policies. |
873 | */ | 873 | */ |
874 | static void blkio_update_blkg_policy(struct blkio_cgroup *blkcg, | 874 | static void blkio_update_blkg_policy(struct blkio_cgroup *blkcg, |
@@ -903,7 +903,7 @@ static void blkio_update_blkg_policy(struct blkio_cgroup *blkcg, | |||
903 | } | 903 | } |
904 | 904 | ||
905 | /* | 905 | /* |
906 | * A policy node rule has been updated. Propogate this update to all the | 906 | * A policy node rule has been updated. Propagate this update to all the |
907 | * block groups which might be affected by this update. | 907 | * block groups which might be affected by this update. |
908 | */ | 908 | */ |
909 | static void blkio_update_policy_node_blkg(struct blkio_cgroup *blkcg, | 909 | static void blkio_update_policy_node_blkg(struct blkio_cgroup *blkcg, |
diff --git a/block/blk-core.c b/block/blk-core.c index 725091d5496d..90f22cc30799 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -1184,7 +1184,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, | |||
1184 | 1184 | ||
1185 | /* | 1185 | /* |
1186 | * Attempts to merge with the plugged list in the current process. Returns | 1186 | * Attempts to merge with the plugged list in the current process. Returns |
1187 | * true if merge was succesful, otherwise false. | 1187 | * true if merge was successful, otherwise false. |
1188 | */ | 1188 | */ |
1189 | static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, | 1189 | static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, |
1190 | struct bio *bio) | 1190 | struct bio *bio) |
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 6c98cfeeedf0..0475a22a420d 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c | |||
@@ -916,7 +916,7 @@ static void throtl_update_blkio_group_common(struct throtl_data *td, | |||
916 | /* | 916 | /* |
917 | * For all update functions, key should be a valid pointer because these | 917 | * For all update functions, key should be a valid pointer because these |
918 | * update functions are called under blkcg_lock, that means, blkg is | 918 | * update functions are called under blkcg_lock, that means, blkg is |
919 | * valid and in turn key is valid. queue exit path can not race becuase | 919 | * valid and in turn key is valid. queue exit path can not race because |
920 | * of blkcg_lock | 920 | * of blkcg_lock |
921 | * | 921 | * |
922 | * Can not take queue lock in update functions as queue lock under blkcg_lock | 922 | * Can not take queue lock in update functions as queue lock under blkcg_lock |
diff --git a/block/blk.h b/block/blk.h index c8db371a921d..61263463e38e 100644 --- a/block/blk.h +++ b/block/blk.h | |||
@@ -32,7 +32,7 @@ enum rq_atomic_flags { | |||
32 | 32 | ||
33 | /* | 33 | /* |
34 | * EH timer and IO completion will both attempt to 'grab' the request, make | 34 | * EH timer and IO completion will both attempt to 'grab' the request, make |
35 | * sure that only one of them suceeds | 35 | * sure that only one of them succeeds |
36 | */ | 36 | */ |
37 | static inline int blk_mark_rq_complete(struct request *rq) | 37 | static inline int blk_mark_rq_complete(struct request *rq) |
38 | { | 38 | { |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 7785169f3c8f..3be881ec95ad 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -888,7 +888,7 @@ cfq_group_notify_queue_add(struct cfq_data *cfqd, struct cfq_group *cfqg) | |||
888 | /* | 888 | /* |
889 | * Currently put the group at the end. Later implement something | 889 | * Currently put the group at the end. Later implement something |
890 | * so that groups get lesser vtime based on their weights, so that | 890 | * so that groups get lesser vtime based on their weights, so that |
891 | * if group does not loose all if it was not continously backlogged. | 891 | * if group does not loose all if it was not continuously backlogged. |
892 | */ | 892 | */ |
893 | n = rb_last(&st->rb); | 893 | n = rb_last(&st->rb); |
894 | if (n) { | 894 | if (n) { |
diff --git a/block/genhd.c b/block/genhd.c index c91a2dac6b6b..b364bd038a18 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -739,7 +739,7 @@ void __init printk_all_partitions(void) | |||
739 | 739 | ||
740 | /* | 740 | /* |
741 | * Don't show empty devices or things that have been | 741 | * Don't show empty devices or things that have been |
742 | * surpressed | 742 | * suppressed |
743 | */ | 743 | */ |
744 | if (get_capacity(disk) == 0 || | 744 | if (get_capacity(disk) == 0 || |
745 | (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) | 745 | (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) |