From patchwork Tue Nov 4 19:19:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrique Martins X-Patchwork-Id: 5230631 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C8E1CC11AC for ; Tue, 4 Nov 2014 19:20:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E195A20173 for ; Tue, 4 Nov 2014 19:20:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB97620166 for ; Tue, 4 Nov 2014 19:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751305AbaKDTT6 (ORCPT ); Tue, 4 Nov 2014 14:19:58 -0500 Received: from gproxy7-pub.mail.unifiedlayer.com ([70.40.196.235]:43174 "HELO gproxy7-pub.mail.unifiedlayer.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751294AbaKDTT6 convert rfc822-to-8bit (ORCPT ); Tue, 4 Nov 2014 14:19:58 -0500 Received: (qmail 25822 invoked by uid 0); 4 Nov 2014 19:19:56 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy7.mail.unifiedlayer.com with SMTP; 4 Nov 2014 19:19:56 -0000 Received: from box503.bluehost.com ([74.220.219.103]) by cmgw3 with id BdKr1p0022ESxDm01dKuEa; Tue, 04 Nov 2014 18:19:55 -0700 X-Authority-Analysis: v=2.1 cv=ON60g0qB c=1 sm=1 tr=0 a=PavW1xtFd4Pw9NMPtIuMBw==:117 a=PavW1xtFd4Pw9NMPtIuMBw==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=kj9zAlcOel0A:10 a=5FTrZqgKwc4A:10 a=Iv8U_6P3r1YA:10 a=20KFwNOVAAAA:8 a=_P-8b6jXfRZckSH2Qw8A:9 a=CjuIK1q_8ugA:10 a=W1Qa9jQPuNAA:10 a=lOTvLVXyUbQA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=martins.cc; s=default; h=Message-ID:Date:Content-Transfer-Encoding:Content-ID:Content-Type:MIME-Version:Subject:cc:To:From; bh=smt8rMbsP8cTPAZ9x4gJXCKgwBlS/VoRGfP9Rlro32c=; b=HQlzZ7MleRh4IOcDxv4cG5WzlJuuKtlN1KLk3DxCI4erFULFLge5o1j1iDzjafLf8RAvZfQv+uC8Wp/364Aat0DX7h6terfPP0Ae8iDUkKVDnilGn11tGILwozGE6Rsr; Received: from [24.130.49.43] (port=44735 helo=monster.martins.cc) by box503.bluehost.com with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1Xljdv-0007yd-NN; Tue, 04 Nov 2014 12:19:51 -0700 Received: from monster.martins.cc (monster.martins.cc [127.0.0.1]) by monster.martins.cc (Postfix) with ESMTP id 0AFC6600A8; Tue, 4 Nov 2014 11:19:49 -0800 (PST) From: Henrique Martins To: Steve Dickson cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/1] nfsd/exportfs: changes handling of unresolvable entries MIME-Version: 1.0 Content-ID: <8956.1415128789.1@monster.martins.cc> Date: Tue, 04 Nov 2014 11:19:49 -0800 Message-ID: <8957.1415128789@monster.martins.cc> X-Identified-User: {32533:box503.bluehost.com:silvadoc:silvado.com} {sentby:smtp auth 24.130.49.43 authed with relay+silvado.com} Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In-reply-to: <54591385.2080007@RedHat.com> References: <14393.1409936528@monster.martins.cc> <15531.1414780435@monster.martins.cc> <54591385.2080007@RedHat.com> Comments: In-reply-to Steve Dickson message dated "Tue, 04 Nov 2014 12:57:25 -0500." X-Mailer: MH-E 8.5; nmh 1.6; XEmacs 21.5 (beta34) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" -------- --=-=-= Content-Type: text/plain; charset=utf-8 Attaching patch to nfs/exportfs to allow nfsd to start when there are some, but not all, unresolvable entries in /etc/exports. Nfs currently fails to start in my laptop which has work machines listed in exports that aren't resolvable when I'm not in the office, and home machines in exports that aren't resolvable when I'm not home. Files changed: - in client.c/client_lookup: changes the (x)log level for unresolvable entries in /etc/exports from L_ERROR to L_WARNING, - in hostname.c/host_addrinfo: changes the (x)log level for unresolvable entries in /etc/exports from D_GENERAL to D_PARSE, - in export.c/export_read: counts the number of exported volume entries and generates a (x)log L_ERROR if no volumes are exported. Built and tested on a Fedora 20 (fully updated) system. Signed-off-by: Henrique Martins --- --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=nfs-utils-1.3.0-exportfs.patch --=-=-=-- -- 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 --- nfs-utils-1.3.0/support/export/client.c.orig 2014-09-05 08:21:37.568364360 -0700 +++ nfs-utils-1.3.0/support/export/client.c 2014-09-05 08:21:41.709451778 -0700 @@ -277,7 +277,7 @@ if (htype == MCL_FQDN && !canonical) { ai = host_addrinfo(hname); if (!ai) { - xlog(L_ERROR, "Failed to resolve %s", hname); + xlog(L_WARNING, "Failed to resolve %s", hname); goto out; } hname = ai->ai_canonname; --- nfs-utils-1.3.0/support/export/hostname.c.orig 2014-09-05 08:09:07.387551291 -0700 +++ nfs-utils-1.3.0/support/export/hostname.c 2014-09-05 08:09:13.799573723 -0700 @@ -175,11 +175,11 @@ case 0: return ai; case EAI_SYSTEM: - xlog(D_GENERAL, "%s: failed to resolve %s: (%d) %m", + xlog(D_PARSE, "%s: failed to resolve %s: (%d) %m", __func__, hostname, errno); break; default: - xlog(D_GENERAL, "%s: failed to resolve %s: %s", + xlog(D_PARSE, "%s: failed to resolve %s: %s", __func__, hostname, gai_strerror(error)); break; } --- nfs-utils-1.3.0/support/export/export.c.orig 2014-03-25 08:12:07.000000000 -0700 +++ nfs-utils-1.3.0/support/export/export.c 2014-09-05 09:23:37.424105125 -0700 @@ -76,15 +76,22 @@ struct exportent *eep; nfs_export *exp; + int volumes = 0; + setexportent(fname, "r"); while ((eep = getexportent(0,1)) != NULL) { exp = export_lookup(eep->e_hostname, eep->e_path, 0); - if (!exp) - export_create(eep, 0); + if (!exp) { + exp = export_create(eep, 0); + if (exp) + volumes++; + } else warn_duplicated_exports(exp, eep); } endexportent(); + if (volumes == 0) + xlog(L_ERROR, "no or all unresolvable export entries"); } /**