diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-14 19:18:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-14 19:18:44 -0700 |
| commit | 5732c468495effd3089c1c893f3eba9a8a1d373c (patch) | |
| tree | 6cb79b79acde60efd82af296fd312569034d5a58 /fs/btrfs/super.c | |
| parent | 45d447406a19cbfd42720f066f156f4eb9d68801 (diff) | |
| parent | 9f55684c2d9869e8cc53595a3fee679958511cfb (diff) | |
| download | op-kernel-dev-5732c468495effd3089c1c893f3eba9a8a1d373c.zip op-kernel-dev-5732c468495effd3089c1c893f3eba9a8a1d373c.tar.gz | |
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/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 6dfae5b..2ff7cd2 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -436,9 +436,9 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs) if (btrfs_test_opt(root, SSD)) seq_puts(seq, ",ssd"); if (btrfs_test_opt(root, NOTREELOG)) - seq_puts(seq, ",no-treelog"); + seq_puts(seq, ",notreelog"); if (btrfs_test_opt(root, FLUSHONCOMMIT)) - seq_puts(seq, ",flush-on-commit"); + seq_puts(seq, ",flushoncommit"); if (!(root->fs_info->sb->s_flags & MS_POSIXACL)) seq_puts(seq, ",noacl"); return 0; |
