From: Olaf Kirch <okir@suse.de>
To: NeilBrown <neilb@suse.de>
Cc: Andrew Morton <akpm@osdl.org>,
nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 002 of 8] knfsd: lockd: fix refount on nsm.
Date: Fri, 29 Sep 2006 08:01:55 +0200 [thread overview]
Message-ID: <20060929060155.GB2852@suse.de> (raw)
In-Reply-To: <1060929030845.24038@suse.de>
On Fri, Sep 29, 2006 at 01:08:45PM +1000, NeilBrown wrote:
> If nlm_lookup_host finds what it is looking for
> it exits with an extra reference on the matching
> 'nsm' structure.
> So don't actually count the reference until we are
> (fairly) sure it is going to be used.
>
> Signed-off-by: Neil Brown <neilb@suse.de>
Correct, even though I would have done it slightly differently. The if()
is not needed anymore, and there's another if (nsm) two lines down.
Olaf
fs/lockd/host.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Index: build/fs/lockd/host.c
===================================================================
--- build.orig/fs/lockd/host.c
+++ build/fs/lockd/host.c
@@ -109,9 +109,9 @@ nlm_lookup_host(int server, const struct
if (!nlm_cmp_addr(&host->h_addr, sin))
continue;
- /* See if we have an NSM handle for this client */
- if (!nsm && (nsm = host->h_nsmhandle) != 0)
- atomic_inc(&nsm->sm_count);
+ /* Stash away the NSM handle in case we need
+ * to create a new host entry. */
+ nsm = host->h_nsmhandle;
if (host->h_proto != proto)
continue;
@@ -133,7 +133,9 @@ nlm_lookup_host(int server, const struct
/* Sadly, the host isn't in our hash table yet. See if
* we have an NSM handle for it. If not, create one.
*/
- if (!nsm && !(nsm = nsm_find(sin, hostname, hostname_len)))
+ if (nsm != NULL)
+ atomic_inc(&nsm->sm_count);
+ else if (!(nsm = nsm_find(sin, hostname, hostname_len)))
goto out;
if (!(host = (struct nlm_host *) kmalloc(sizeof(*host), GFP_KERNEL))) {
--
Olaf Kirch | --- o --- Nous sommes du soleil we love when we play
okir@suse.de | / | \ sol.dhoop.naytheet.ah kin.ir.samse.qurax
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
WARNING: multiple messages have this Message-ID (diff)
From: Olaf Kirch <okir@suse.de>
To: NeilBrown <neilb@suse.de>
Cc: Andrew Morton <akpm@osdl.org>,
nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [NFS] [PATCH 002 of 8] knfsd: lockd: fix refount on nsm.
Date: Fri, 29 Sep 2006 08:01:55 +0200 [thread overview]
Message-ID: <20060929060155.GB2852@suse.de> (raw)
In-Reply-To: <1060929030845.24038@suse.de>
On Fri, Sep 29, 2006 at 01:08:45PM +1000, NeilBrown wrote:
> If nlm_lookup_host finds what it is looking for
> it exits with an extra reference on the matching
> 'nsm' structure.
> So don't actually count the reference until we are
> (fairly) sure it is going to be used.
>
> Signed-off-by: Neil Brown <neilb@suse.de>
Correct, even though I would have done it slightly differently. The if()
is not needed anymore, and there's another if (nsm) two lines down.
Olaf
fs/lockd/host.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Index: build/fs/lockd/host.c
===================================================================
--- build.orig/fs/lockd/host.c
+++ build/fs/lockd/host.c
@@ -109,9 +109,9 @@ nlm_lookup_host(int server, const struct
if (!nlm_cmp_addr(&host->h_addr, sin))
continue;
- /* See if we have an NSM handle for this client */
- if (!nsm && (nsm = host->h_nsmhandle) != 0)
- atomic_inc(&nsm->sm_count);
+ /* Stash away the NSM handle in case we need
+ * to create a new host entry. */
+ nsm = host->h_nsmhandle;
if (host->h_proto != proto)
continue;
@@ -133,7 +133,9 @@ nlm_lookup_host(int server, const struct
/* Sadly, the host isn't in our hash table yet. See if
* we have an NSM handle for it. If not, create one.
*/
- if (!nsm && !(nsm = nsm_find(sin, hostname, hostname_len)))
+ if (nsm != NULL)
+ atomic_inc(&nsm->sm_count);
+ else if (!(nsm = nsm_find(sin, hostname, hostname_len)))
goto out;
if (!(host = (struct nlm_host *) kmalloc(sizeof(*host), GFP_KERNEL))) {
--
Olaf Kirch | --- o --- Nous sommes du soleil we love when we play
okir@suse.de | / | \ sol.dhoop.naytheet.ah kin.ir.samse.qurax
next prev parent reply other threads:[~2006-09-29 6:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-29 3:08 [PATCH 000 of 8] knfsd: Introduction NeilBrown
2006-09-29 3:08 ` NeilBrown
2006-09-29 3:08 ` [PATCH 001 of 8] knfsd: Add nfs-export support to tmpfs NeilBrown
2006-09-29 3:08 ` NeilBrown
2006-09-29 6:29 ` Andrew Morton
2006-09-29 6:29 ` Andrew Morton
2006-09-29 6:48 ` Neil Brown
2006-09-29 6:48 ` [NFS] " Neil Brown
2006-09-29 19:41 ` Hugh Dickins
2006-09-29 19:41 ` [NFS] " Hugh Dickins
2006-10-03 0:08 ` Neil Brown
2006-10-03 0:08 ` [NFS] " Neil Brown
2006-09-29 3:08 ` [PATCH 002 of 8] knfsd: lockd: fix refount on nsm NeilBrown
2006-09-29 3:08 ` NeilBrown
2006-09-29 6:01 ` Olaf Kirch [this message]
2006-09-29 6:01 ` [NFS] " Olaf Kirch
2006-09-29 3:08 ` [PATCH 003 of 8] knfsd: Fix auto-sizing of nfsd request/reply buffers NeilBrown
2006-09-29 3:08 ` NeilBrown
2006-09-29 3:08 ` [PATCH 004 of 8] knfsd: Close a race-opportunity in d_splice_alias NeilBrown
2006-09-29 3:08 ` NeilBrown
2006-09-29 3:09 ` [PATCH 005 of 8] knfsd: nfsd: store export path in export NeilBrown
2006-09-29 3:09 ` NeilBrown
2006-09-29 3:09 ` [PATCH 006 of 8] knfsd: nfsd4: fslocations data structures NeilBrown
2006-09-29 3:09 ` NeilBrown
2006-09-29 6:45 ` Andrew Morton
2006-09-29 6:45 ` Andrew Morton
2006-10-02 18:23 ` J. Bruce Fields
2006-10-02 18:23 ` [NFS] " J. Bruce Fields
2006-10-02 18:24 ` [PATCH 1 of 3] nfsd4: fix fs locations bounds-checking J. Bruce Fields
2006-10-02 18:24 ` J. Bruce Fields
2006-10-02 18:26 ` [PATCH 2 of 3] nfsd4: fslocs: fix compile in non-CONFIG_NFSD_V4 case J. Bruce Fields
2006-10-02 18:26 ` J. Bruce Fields
2006-10-02 18:26 ` [PATCH 3 of 3] nfsd4: fslocs: remove spurious NULL check J. Bruce Fields
2006-10-02 18:26 ` J. Bruce Fields
2006-09-29 3:09 ` [PATCH 007 of 8] knfsd: nfsd4: xdr encoding for fs_locations NeilBrown
2006-09-29 3:09 ` NeilBrown
2006-09-29 3:09 ` [PATCH 008 of 8] knfsd: nfsd4: actually use all the pieces to implement referrals NeilBrown
2006-09-29 3:09 ` NeilBrown
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=20060929060155.GB2852@suse.de \
--to=okir@suse.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
--cc=nfs@lists.sourceforge.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.