diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-14 22:18:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-14 22:18:44 -0400 |
| commit | 5732c468495effd3089c1c893f3eba9a8a1d373c (patch) | |
| tree | 6cb79b79acde60efd82af296fd312569034d5a58 /fs/btrfs/extent-tree.c | |
| parent | 45d447406a19cbfd42720f066f156f4eb9d68801 (diff) | |
| parent | 9f55684c2d9869e8cc53595a3fee679958511cfb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: Spelling fix in btrfs_lookup_first_block_group comments
Btrfs: make show_options result match actual option names
Btrfs: remove outdated comment in btrfs_ioctl_resize()
Btrfs: remove some WARN_ONs in the IO failure path
Btrfs: Don't loop forever on metadata IO failures
Btrfs: init inode ordered_data_close flag properly
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index e4966444811b..3e2c7c738f23 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
| @@ -312,7 +312,7 @@ btrfs_lookup_first_block_group(struct btrfs_fs_info *info, u64 bytenr) | |||
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | /* | 314 | /* |
| 315 | * return the block group that contains teh given bytenr | 315 | * return the block group that contains the given bytenr |
| 316 | */ | 316 | */ |
| 317 | struct btrfs_block_group_cache *btrfs_lookup_block_group( | 317 | struct btrfs_block_group_cache *btrfs_lookup_block_group( |
| 318 | struct btrfs_fs_info *info, | 318 | struct btrfs_fs_info *info, |