From 73abfd17bc2bc6e5ae09b886c00df9d0275595e1 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Mon, 14 Dec 2009 22:01:12 +0000
Subject: [PATCH] --- yaml --- r: 177847 b: refs/heads/master c:
 20a5239a5d0f340e29827a6a2d28a138001c44b8 h: refs/heads/master i:   177845:
 514f59b159d8fc568e6de4fceb700736d80dfd38   177843:
 2b7868b336b5a41843c73835d5ddf4002c8718a3   177839:
 31f02b9861559ab6744792c0f161a5130bf267b5 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/super.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a75f840e2c43..a65108b408b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a8be425a8fb8fbb5d881eb55fa6634c3463b9c9
+refs/heads/master: 20a5239a5d0f340e29827a6a2d28a138001c44b8
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 193d920e54eb..3f9b45704fcd 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/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;