From patchwork Thu May 12 13:18:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Myers X-Patchwork-Id: 780802 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4CJqZfk005190 for ; Thu, 12 May 2011 19:52:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757856Ab1ELTwe (ORCPT ); Thu, 12 May 2011 15:52:34 -0400 Received: from relay3.sgi.com ([192.48.152.1]:54911 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757579Ab1ELTwd (ORCPT ); Thu, 12 May 2011 15:52:33 -0400 Received: from estes.americas.sgi.com (estes.americas.sgi.com [128.162.236.10]) by relay3.corp.sgi.com (Postfix) with ESMTP id DC392AC006; Thu, 12 May 2011 12:52:32 -0700 (PDT) Received: from nfs3.americas.sgi.com (nfs3.americas.sgi.com [128.162.245.55]) by estes.americas.sgi.com (Postfix) with ESMTP id 9C5C7700076D; Thu, 12 May 2011 14:52:32 -0500 (CDT) Received: from [10.79.0.3] (localhost [IPv6:::1]) by nfs3.americas.sgi.com (Postfix) with ESMTP id AEEC9953EB; Thu, 12 May 2011 08:18:10 -0500 (CDT) Subject: [PATCH] nfs-utils: getexportent interprets -test-client- as default options To: steved@redhat.com From: Ben Myers Cc: neilb@suse.de, linux-nfs@vger.kernel.org Date: Thu, 12 May 2011 08:18:10 -0500 Message-ID: <20110512131810.25028.50931.stgit@nfs3> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 12 May 2011 19:52:35 +0000 (UTC) With commit 1374c3861abdc66f3a1410e26cc85f86760b51dd Neil added a -test-client- export to test the exportability of filesystems when exportfs is run. When using the old cache controls (i.e. /proc/fs/nfsd is not mounted) exportfs will read /proc/fs/nfs/exports and find these test client entries. The dash at the beginning of -test-client- will be cause getexportent to look for default options in the rest of the string, which test-client- will not match: exportfs: /proc/fs/nfs/exports:1: unknown keyword "test-client-(rw" This patch resolves the problem by testing for -test-client- string in the check for default arguments. Signed-off-by: Ben Myers --- support/nfs/exports.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 6acb2b6..7e29155 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -142,9 +142,12 @@ getexportent(int fromkernel, int fromexports) return NULL; } first = 0; - - /* Check for default options */ - if (exp[0] == '-') { + + /* + * Check for default options. The test client string does not indicate + * default arguments. + */ + if (exp[0] == '-' && strncmp(exp, "-test-client-", 13) != 0) { if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0) return NULL;