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 <[email protected]>
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
[email protected] | / | \ sol.dhoop.naytheet.ah kin.ir.samse.qurax
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
