]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
NLM: Set address family before calling nlm_host_rebooted()
authorChuck Lever <chuck.lever@ORACLE.COM>
Thu, 23 Oct 2008 04:50:35 +0000 (00:50 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 30 Oct 2008 21:19:30 +0000 (17:19 -0400)
commitd7dc61d0a70371b1c6557ea8ffbc60fff94c8168
tree78cc625fbdc4a0ff643ccebe6938ff1036eab00b
parent8d7c4203c681a3ec359eccff4e53bc8c0ccf403b
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>
fs/lockd/svc4proc.c
fs/lockd/svcproc.c