diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 18:18:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 18:18:37 -0400 |
| commit | 0fd97ab48971735e38677cfdab64e4db581530f8 (patch) | |
| tree | e799f906321679314b58b91aea7069947b71933c /fs | |
| parent | 7fcaa9aaea48996ba308c047a381de7a17ce03b2 (diff) | |
| parent | e9c549998dc24209847007e1f209f3b6c88d21ba (diff) | |
Merge branch 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6:
Revert wrong fixes for common misspellings
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
| -rw-r--r-- | fs/ocfs2/ocfs2_fs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 2e61fe1b6b8c..8f4b81de3ae2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -718,7 +718,7 @@ struct btrfs_space_info { | |||
| 718 | u64 total_bytes; /* total bytes in the space, | 718 | u64 total_bytes; /* total bytes in the space, |
| 719 | this doesn't take mirrors into account */ | 719 | this doesn't take mirrors into account */ |
| 720 | u64 bytes_used; /* total bytes used, | 720 | u64 bytes_used; /* total bytes used, |
| 721 | this does't take mirrors into account */ | 721 | this doesn't take mirrors into account */ |
| 722 | u64 bytes_pinned; /* total bytes pinned, will be freed when the | 722 | u64 bytes_pinned; /* total bytes pinned, will be freed when the |
| 723 | transaction finishes */ | 723 | transaction finishes */ |
| 724 | u64 bytes_reserved; /* total bytes the allocator has reserved for | 724 | u64 bytes_reserved; /* total bytes the allocator has reserved for |
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index b68f87a83924..938387a10d5d 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h | |||
| @@ -1019,7 +1019,7 @@ struct ocfs2_xattr_entry { | |||
| 1019 | __le16 xe_name_offset; /* byte offset from the 1st entry in the | 1019 | __le16 xe_name_offset; /* byte offset from the 1st entry in the |
| 1020 | local xattr storage(inode, xattr block or | 1020 | local xattr storage(inode, xattr block or |
| 1021 | xattr bucket). */ | 1021 | xattr bucket). */ |
| 1022 | __u8 xe_name_len; /* xattr name len, does't include prefix. */ | 1022 | __u8 xe_name_len; /* xattr name len, doesn't include prefix. */ |
| 1023 | __u8 xe_type; /* the low 7 bits indicate the name prefix | 1023 | __u8 xe_type; /* the low 7 bits indicate the name prefix |
| 1024 | * type and the highest bit indicates whether | 1024 | * type and the highest bit indicates whether |
| 1025 | * the EA is stored in the local storage. */ | 1025 | * the EA is stored in the local storage. */ |