public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: steved@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 6/6] libexport.a: replace xlog(L_FATAL) in client_check()
Date: Tue, 23 Mar 2010 12:53:57 -0400	[thread overview]
Message-ID: <20100323165357.4368.65171.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100323165122.4368.43659.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>

Clean up: Prevent the process from exiting in client_check().  Report
bad m_type values, but return 0.

This removes another site where a mountd or exportfs process can exit
sideways.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 support/export/client.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/support/export/client.c b/support/export/client.c
index bf2a359..aa28fcf 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -451,9 +451,13 @@ check_netgroup(__attribute__((unused)) const nfs_client *clp,
 }
 #endif	/* !HAVE_INNETGR */
 
-/*
- * Match a host (given its hostent record) to a client record. This
- * is usually called from mountd.
+/**
+ * client_check - check if IP address information matches a cached nfs_client
+ * @clp: pointer to a cached nfs_client record
+ * @hp: pointer to hostent containing host IP information
+ *
+ * Returns 1 if the address information matches the cached nfs_client,
+ * otherwise zero.
  */
 int
 client_check(nfs_client *clp, struct hostent *hp)
@@ -472,7 +476,8 @@ client_check(nfs_client *clp, struct hostent *hp)
 	case MCL_GSS:
 		return 0;
 	default:
-		xlog(L_FATAL, "internal: bad client type %d", clp->m_type);
+		xlog(D_GENERAL, "%s: unrecognized client type: %d",
+				__func__, clp->m_type);
 	}
 
 	return 0;


  parent reply	other threads:[~2010-03-23 16:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-23 16:52 [PATCH 0/6] Refactor client_check() Chuck Lever
     [not found] ` <20100323165122.4368.43659.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2010-03-23 16:52   ` [PATCH 1/6] libexport.a: Factor FQDN checking out of check_client() Chuck Lever
2010-03-23 16:53   ` [PATCH 2/6] libexport.a: Factor SUBNETWORK " Chuck Lever
2010-03-23 16:53   ` [PATCH 3/6] libexport.a: Remove unused function client_checkaddr() Chuck Lever
2010-03-23 16:53   ` [PATCH 4/6] libexport.a: Refactor netgroup checking in client_check() Chuck Lever
2010-03-23 16:53   ` [PATCH 5/6] libexport.a: Refactor wildcard " Chuck Lever
2010-03-23 16:53   ` Chuck Lever [this message]
2010-04-08 15:21   ` [PATCH 0/6] Refactor client_check() Steve Dickson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100323165357.4368.65171.stgit@localhost.localdomain \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=steved@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox