From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: Re: [PATCH 2/6] NLM: Clean up before introducing new debugging messages Date: Thu, 11 Sep 2008 17:42:25 -0400 Message-ID: <20080911214225.GD17355@fieldses.org> References: <20080827204852.17837.38361.stgit@manray.1015granger.net> <20080827205714.17837.95227.stgit@manray.1015granger.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: trond.myklebust@netapp.com, linux-nfs@vger.kernel.org To: Chuck Lever Return-path: Received: from mail.fieldses.org ([66.93.2.214]:60013 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbYIKVma (ORCPT ); Thu, 11 Sep 2008 17:42:30 -0400 In-Reply-To: <20080827205714.17837.95227.stgit-meopP2rzCrTwdl/1UfZZQIVfYA8g3rJ/@public.gmane.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, Aug 27, 2008 at 04:57:15PM -0400, Chuck Lever wrote: > We're about to introduce some extra debugging messages in nlm_lookup_host(). > Bring the coding style up to date first so we can cleanly introduce the new > debugging messages. Looks fine to me.--b. > > Signed-off-by: Chuck Lever > --- > > fs/lockd/host.c | 19 +++++++++++-------- > 1 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/fs/lockd/host.c b/fs/lockd/host.c > index a17664c..cb26e3d 100644 > --- a/fs/lockd/host.c > +++ b/fs/lockd/host.c > @@ -103,16 +103,19 @@ static struct nlm_host *nlm_lookup_host(int server, > nlm_get_host(host); > goto out; > } > - if (nsm) > - atomic_inc(&nsm->sm_count); > - > - host = NULL; > > - /* Sadly, the host isn't in our hash table yet. See if > - * we have an NSM handle for it. If not, create one. > + /* > + * The host wasn't in our hash table. If we don't > + * have an NSM handle for it yet, create one. > */ > - if (!nsm && !(nsm = nsm_find(sin, hostname, hostname_len))) > - goto out; > + if (nsm) > + atomic_inc(&nsm->sm_count); > + else { > + host = NULL; > + nsm = nsm_find(sin, hostname, hostname_len); > + if (!nsm) > + goto out; > + } > > host = kzalloc(sizeof(*host), GFP_KERNEL); > if (!host) { >