Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343022
b: refs/heads/master
c: 83f0d77
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Jiri Kosina committed Oct 29, 2012
1 parent 5dec304 commit 5c50bdc
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54d00f6069d921bfe83344cb94e2dd7cb54531ef
refs/heads/master: 83f0d77a7f336130a0ae1290d6bcfa606abaad66
2 changes: 1 addition & 1 deletion trunk/drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -4124,7 +4124,7 @@ static struct md_sysfs_entry md_size =
__ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store);


/* Metdata version.
/* Metadata version.
* This is one of
* 'none' for arrays with no metadata (good luck...)
* 'external' for arrays with externally managed metadata,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/md/persistent-data/dm-block-manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* may be held at once. This is just an implementation detail.
*
* ii) Recursive locking attempts are detected and return EINVAL. A stack
* trace is also emitted for the previous lock aquisition.
* trace is also emitted for the previous lock acquisition.
*
* iii) Priority is given to write locks.
*/
Expand Down Expand Up @@ -109,7 +109,7 @@ static int __check_holder(struct block_lock *lock)
DMERR("previously held here:");
print_stack_trace(lock->traces + i, 4);

DMERR("subsequent aquisition attempted here:");
DMERR("subsequent acquisition attempted here:");
t.nr_entries = 0;
t.max_entries = MAX_STACK;
t.entries = entries;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/persistent-data/dm-btree.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct dm_transaction_manager;
*/

/*
* Infomation about the values stored within the btree.
* Information about the values stored within the btree.
*/
struct dm_btree_value_type {
void *context;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -1576,7 +1576,7 @@ static int resize_stripes(struct r5conf *conf, int newsize)
* This happens in stages:
* 1/ create a new kmem_cache and allocate the required number of
* stripe_heads.
* 2/ gather all the old stripe_heads and tranfer the pages across
* 2/ gather all the old stripe_heads and transfer the pages across
* to the new stripe_heads. This will have the side effect of
* freezing the array as once all stripe_heads have been collected,
* no IO will be possible. Old stripe heads are freed once their
Expand Down

0 comments on commit 5c50bdc

Please sign in to comment.