From patchwork Sat Nov 7 06:19:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 58295 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA76JLNO026155 for ; Sat, 7 Nov 2009 06:19:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750990AbZKGGTN (ORCPT ); Sat, 7 Nov 2009 01:19:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751049AbZKGGTN (ORCPT ); Sat, 7 Nov 2009 01:19:13 -0500 Received: from cobra.newdream.net ([66.33.216.30]:34129 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878AbZKGGTM (ORCPT ); Sat, 7 Nov 2009 01:19:12 -0500 Received: from localhost.localdomain (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by cobra.newdream.net (Postfix) with ESMTP id 57799BC806; Fri, 6 Nov 2009 22:19:18 -0800 (PST) From: Sage Weil To: linux-btrfs@vger.kernel.org Cc: Sage Weil Subject: [PATCH] Btrfs: fail mount on bad mount options Date: Fri, 6 Nov 2009 22:19:16 -0800 Message-Id: <1257574756-13333-1-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.5.6.5 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 ad4d378..73adcef 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -129,6 +129,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) substring_t args[MAX_OPT_ARGS]; char *p, *num; int intarg; + int ret = 0; if (!options) return 0; @@ -268,12 +269,18 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) case Opt_discard: btrfs_set_opt(info->mount_opt, DISCARD); break; + case Opt_err: + printk(KERN_INFO "btrfs: unrecognized mount option " + "'%s'\n", p); + ret = -EINVAL; + goto out; default: break; } } +out: kfree(options); - return 0; + return ret; } /*