Btrfs: Show discard option in /proc/mounts
authorMatthew Wilcox <matthew@wil.cx>
Mon, 14 Dec 2009 22:01:12 +0000 (22:01 +0000)
committerChris Mason <chris.mason@oracle.com>
Thu, 17 Dec 2009 17:33:37 +0000 (12:33 -0500)
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>
fs/btrfs/super.c

Simple merge