From: Matthew Wilcox <matthew@wil.cx>
Date: Mon, 14 Dec 2009 22:01:12 +0000 (+0000)
Subject: Btrfs: Show discard option in /proc/mounts
X-Git-Tag: firefly_0821_release~9833^2~2151^2~74
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=20a5239a5d0f340e29827a6a2d28a138001c44b8;p=firefly-linux-kernel-4.4.55.git

Btrfs: Show discard option in /proc/mounts

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@linux.intel.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 193d920e54eb..3f9b45704fcd 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -457,6 +457,8 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
 		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;