diff options
| author | NeilBrown <neilb@suse.de> | 2006-10-04 02:16:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 07:55:20 -0700 |
| commit | 6b54dae2b0defb30babb0fe87b13463b9f4b2907 (patch) | |
| tree | 0a9e2d34f4fb089287b6d5b92cb438b30dd66293 /fs/lockd | |
| parent | b66285cee3f9abad26cca6c9b848e1ad6b792d94 (diff) | |
| download | kernel_samsung_espresso10-6b54dae2b0defb30babb0fe87b13463b9f4b2907.zip kernel_samsung_espresso10-6b54dae2b0defb30babb0fe87b13463b9f4b2907.tar.gz kernel_samsung_espresso10-6b54dae2b0defb30babb0fe87b13463b9f4b2907.tar.bz2 | |
[PATCH] knfsd: lockd: fix refount on nsm
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/host.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 0257a55..fb24a97 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -103,8 +103,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin, continue; /* See if we have an NSM handle for this client */ - if (!nsm && (nsm = host->h_nsmhandle) != 0) - atomic_inc(&nsm->sm_count); + if (!nsm) + nsm = host->h_nsmhandle; if (host->h_proto != proto) continue; @@ -120,6 +120,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin, nlm_get_host(host); goto out; } + if (nsm) + atomic_inc(&nsm->sm_count); host = NULL; |