NLM: Set address family before calling nlm_host_rebooted()

The nlm_host_rebooted() function uses nlm_cmp_addr() to find an
nsm_handle that matches the rebooted peer. In order for this to work,
the passed-in address must have a proper address family.

This fixes a post-2.6.28 regression introduced by commit 781b61a6, which
added AF_INET6 support to nlm_cmp_addr(). Before that commit,
nlm_cmp_addr() didn't care about the address family; it compared only
the sin_addr.s_addr field for equality.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

authored by Chuck Lever and committed by J. Bruce Fields d7dc61d0 8d7c4203

+2
+1
fs/lockd/svc4proc.c
··· 434 434 * reclaim all locks we hold on this server. 435 435 */ 436 436 memset(&saddr, 0, sizeof(saddr)); 437 + saddr.sin_family = AF_INET; 437 438 saddr.sin_addr.s_addr = argp->addr; 438 439 nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); 439 440
+1
fs/lockd/svcproc.c
··· 466 466 * reclaim all locks we hold on this server. 467 467 */ 468 468 memset(&saddr, 0, sizeof(saddr)); 469 + saddr.sin_family = AF_INET; 469 470 saddr.sin_addr.s_addr = argp->addr; 470 471 nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); 471 472