[058/111] Btrfs: Show discard option in /proc/mounts
in [Kernel]
|
Prev: [043/111] Btrfs: Avoid superfluous tree-log writeout
Next: [[PATCH 07/11]] viafb: propagate __init and __devinit
From: Greg KH on 11 Aug 2010 20:00 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Matthew Wilcox <matthew(a)wil.cx> commit 20a5239a5d0f340e29827a6a2d28a138001c44b8 upstream. Christoph's patch e244a0aeb6a599c19a7c802cda6e2d67c847b154 doesn't display the discard option in /proc/mounts, leading to some confusion for me. Here's the missing bit. Signed-off-by: Matthew Wilcox <willy(a)linux.intel.com> Signed-off-by: Chris Mason <chris.mason(a)oracle.com> Acked-by: Jeff Mahoney <jeffm(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- fs/btrfs/super.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -457,6 +457,8 @@ static int btrfs_show_options(struct seq seq_puts(seq, ",notreelog"); if (btrfs_test_opt(root, FLUSHONCOMMIT)) seq_puts(seq, ",flushoncommit"); + if (btrfs_test_opt(root, DISCARD)) + seq_puts(seq, ",discard"); if (!(root->fs_info->sb->s_flags & MS_POSIXACL)) seq_puts(seq, ",noacl"); return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |