From patchwork Mon Dec 14 22:01:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 67375 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBEM1Gf7024429 for ; Mon, 14 Dec 2009 22:01:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758470AbZLNWBP (ORCPT ); Mon, 14 Dec 2009 17:01:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758445AbZLNWBP (ORCPT ); Mon, 14 Dec 2009 17:01:15 -0500 Received: from palinux.external.hp.com ([192.25.206.14]:45949 "EHLO mail.parisc-linux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758411AbZLNWBO (ORCPT ); Mon, 14 Dec 2009 17:01:14 -0500 Received: by mail.parisc-linux.org (Postfix, from userid 26919) id F0A74494005; Mon, 14 Dec 2009 15:01:12 -0700 (MST) Date: Mon, 14 Dec 2009 15:01:12 -0700 From: Matthew Wilcox To: Chris Mason Cc: linux-btrfs@vger.kernel.org, Christoph Hellwig Subject: [PATCH] btrfs: Show discard option in /proc/mounts Message-ID: <20091214220112.GJ7812@parisc-linux.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 752a546..5e5bd29 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -450,6 +450,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;