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;