Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92825
b: refs/heads/master
c: d842120
h: refs/heads/master
i:
  92823: f824dcb
v: v3
  • Loading branch information
J. Bruce Fields committed Apr 23, 2008
1 parent 341d362 commit 041416f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a95e56e72c196970a8067cd515c658d064813170
refs/heads/master: d8421202121ce74daf4625ca9d1d825bbd7ce66a
34 changes: 19 additions & 15 deletions trunk/fs/lockd/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ nlm_gc_hosts(void)
* Manage NSM handles
*/
static LIST_HEAD(nsm_handles);
static DEFINE_MUTEX(nsm_mutex);
static DEFINE_SPINLOCK(nsm_lock);

static struct nsm_handle *
__nsm_find(const struct sockaddr_in *sin,
Expand All @@ -479,7 +479,8 @@ __nsm_find(const struct sockaddr_in *sin,
return NULL;
}

mutex_lock(&nsm_mutex);
retry:
spin_lock(&nsm_lock);
list_for_each_entry(pos, &nsm_handles, sm_link) {

if (hostname && nsm_use_hostnames) {
Expand All @@ -489,28 +490,32 @@ __nsm_find(const struct sockaddr_in *sin,
} else if (!nlm_cmp_addr(&pos->sm_addr, sin))
continue;
atomic_inc(&pos->sm_count);
kfree(nsm);
nsm = pos;
goto out;
goto found;
}

if (!create) {
nsm = NULL;
goto out;
if (nsm) {
list_add(&nsm->sm_link, &nsm_handles);
goto found;
}
spin_unlock(&nsm_lock);

if (!create)
return NULL;

nsm = kzalloc(sizeof(*nsm) + hostname_len + 1, GFP_KERNEL);
if (nsm == NULL)
goto out;
return NULL;

nsm->sm_addr = *sin;
nsm->sm_name = (char *) (nsm + 1);
memcpy(nsm->sm_name, hostname, hostname_len);
nsm->sm_name[hostname_len] = '\0';
atomic_set(&nsm->sm_count, 1);
goto retry;

list_add(&nsm->sm_link, &nsm_handles);

out:
mutex_unlock(&nsm_mutex);
found:
spin_unlock(&nsm_lock);
return nsm;
}

Expand All @@ -529,10 +534,9 @@ nsm_release(struct nsm_handle *nsm)
{
if (!nsm)
return;
mutex_lock(&nsm_mutex);
if (atomic_dec_and_test(&nsm->sm_count)) {
if (atomic_dec_and_lock(&nsm->sm_count, &nsm_lock)) {
list_del(&nsm->sm_link);
spin_unlock(&nsm_lock);
kfree(nsm);
}
mutex_unlock(&nsm_mutex);
}

0 comments on commit 041416f

Please sign in to comment.