diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/md | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 2 | ||||
| -rw-r--r-- | drivers/md/persistent-data/dm-block-manager.c | 4 | ||||
| -rw-r--r-- | drivers/md/persistent-data/dm-btree.h | 2 | ||||
| -rw-r--r-- | drivers/md/raid5.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 61200717687b..bd8bf0953fe3 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -4124,7 +4124,7 @@ static struct md_sysfs_entry md_size = | |||
| 4124 | __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store); | 4124 | __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store); |
| 4125 | 4125 | ||
| 4126 | 4126 | ||
| 4127 | /* Metdata version. | 4127 | /* Metadata version. |
| 4128 | * This is one of | 4128 | * This is one of |
| 4129 | * 'none' for arrays with no metadata (good luck...) | 4129 | * 'none' for arrays with no metadata (good luck...) |
| 4130 | * 'external' for arrays with externally managed metadata, | 4130 | * 'external' for arrays with externally managed metadata, |
diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index 5ba277768d99..a3ae09124a67 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | * may be held at once. This is just an implementation detail. | 25 | * may be held at once. This is just an implementation detail. |
| 26 | * | 26 | * |
| 27 | * ii) Recursive locking attempts are detected and return EINVAL. A stack | 27 | * ii) Recursive locking attempts are detected and return EINVAL. A stack |
| 28 | * trace is also emitted for the previous lock aquisition. | 28 | * trace is also emitted for the previous lock acquisition. |
| 29 | * | 29 | * |
| 30 | * iii) Priority is given to write locks. | 30 | * iii) Priority is given to write locks. |
| 31 | */ | 31 | */ |
| @@ -109,7 +109,7 @@ static int __check_holder(struct block_lock *lock) | |||
| 109 | DMERR("previously held here:"); | 109 | DMERR("previously held here:"); |
| 110 | print_stack_trace(lock->traces + i, 4); | 110 | print_stack_trace(lock->traces + i, 4); |
| 111 | 111 | ||
| 112 | DMERR("subsequent aquisition attempted here:"); | 112 | DMERR("subsequent acquisition attempted here:"); |
| 113 | t.nr_entries = 0; | 113 | t.nr_entries = 0; |
| 114 | t.max_entries = MAX_STACK; | 114 | t.max_entries = MAX_STACK; |
| 115 | t.entries = entries; | 115 | t.entries = entries; |
diff --git a/drivers/md/persistent-data/dm-btree.h b/drivers/md/persistent-data/dm-btree.h index ae02c84410ff..a2cd50441ca1 100644 --- a/drivers/md/persistent-data/dm-btree.h +++ b/drivers/md/persistent-data/dm-btree.h | |||
| @@ -35,7 +35,7 @@ struct dm_transaction_manager; | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * Infomation about the values stored within the btree. | 38 | * Information about the values stored within the btree. |
| 39 | */ | 39 | */ |
| 40 | struct dm_btree_value_type { | 40 | struct dm_btree_value_type { |
| 41 | void *context; | 41 | void *context; |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index a4502686e7a8..3380372c0393 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -1576,7 +1576,7 @@ static int resize_stripes(struct r5conf *conf, int newsize) | |||
| 1576 | * This happens in stages: | 1576 | * This happens in stages: |
| 1577 | * 1/ create a new kmem_cache and allocate the required number of | 1577 | * 1/ create a new kmem_cache and allocate the required number of |
| 1578 | * stripe_heads. | 1578 | * stripe_heads. |
| 1579 | * 2/ gather all the old stripe_heads and tranfer the pages across | 1579 | * 2/ gather all the old stripe_heads and transfer the pages across |
| 1580 | * to the new stripe_heads. This will have the side effect of | 1580 | * to the new stripe_heads. This will have the side effect of |
| 1581 | * freezing the array as once all stripe_heads have been collected, | 1581 | * freezing the array as once all stripe_heads have been collected, |
| 1582 | * no IO will be possible. Old stripe heads are freed once their | 1582 | * no IO will be possible. Old stripe heads are freed once their |
