lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NLM: Call nsm_reboot_lookup() instead of nsm_find()

Browse Source 
Invoke the newly introduced nsm_reboot_lookup() function in
nlm_host_rebooted() instead of nsm_find().

This introduces just one behavioral change: debugging messages
produced during reboot notification will now appear when the
NLMDBG_MONITOR flag is set, but not when the NLMDBG_HOSTCACHE flag
is set.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Chuck Lever
2008-12-05 19:03:54 -05:00
committed by J. Bruce Fields
parent 3420a8c435
commit 8c7378fd2a
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fs/lockd/host.c
View File

@@ -453,30 +453,14 @@ void nlm_release_host(struct nlm_host *host)
*/ */
void nlm_host_rebooted(const struct nlm_reboot *info) void nlm_host_rebooted(const struct nlm_reboot *info)
{ {
__be32 *p = (__be32 *)&info->priv.data;
const struct sockaddr_in sin = {
.sin_family = AF_INET,
.sin_addr.s_addr = *p,
};
struct hlist_head *chain; struct hlist_head *chain;
struct hlist_node *pos; struct hlist_node *pos;
struct nsm_handle *nsm; struct nsm_handle *nsm;
struct nlm_host *host; struct nlm_host *host;
nsm = nsm_find((struct sockaddr *)&sin, sizeof(sin), nsm = nsm_reboot_lookup(info);
info->mon, info->len, 0); if (unlikely(nsm == NULL))
if (nsm == NULL) {
dprintk("lockd: never saw rebooted peer '%.*s' before\n",
info->len, info->mon);
return; return;
}
dprintk("lockd: nlm_host_rebooted(%.*s, %s)\n",
info->len, info->mon, nsm->sm_addrbuf);
/* When reclaiming locks on this peer, make sure that
* we set up a new notification */
nsm->sm_monitored = 0;
/* Mark all hosts tied to this NSM state as having rebooted. /* Mark all hosts tied to this NSM state as having rebooted.
* We run the loop repeatedly, because we drop the host table * We run the loop repeatedly, because we drop the host table