summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2009-12-14 22:01:12 +0000
committerChris Mason <chris.mason@oracle.com>2009-12-17 12:33:37 -0500
commit20a5239a5d0f340e29827a6a2d28a138001c44b8 (patch)
treed7087f74dc609e3ca9d06aeb2714125e51f443cc /fs
parent4a8be425a8fb8fbb5d881eb55fa6634c3463b9c9 (diff)
downloadlinux-20a5239a5d0f340e29827a6a2d28a138001c44b8.tar.gz
linux-20a5239a5d0f340e29827a6a2d28a138001c44b8.tar.bz2
linux-20a5239a5d0f340e29827a6a2d28a138001c44b8.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/super.c2
1 files changed, 2 insertions, 0 deletions
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;