NLM: Set address family before calling nlm_host_rebooted() (d7dc61d0) · Commits · 戴 / test

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 , 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

+1 −0

Original line number	Diff line number	Diff line
		@@ -434,6 +434,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst rqstp, struct nlm_reboot argp,
		* reclaim all locks we hold on this server.
		*/
		memset(&saddr, 0, sizeof(saddr));
		saddr.sin_family = AF_INET;
		saddr.sin_addr.s_addr = argp->addr;
		nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state);

fs/lockd/svcproc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst rqstp, struct nlm_reboot argp,
		* reclaim all locks we hold on this server.
		*/
		memset(&saddr, 0, sizeof(saddr));
		saddr.sin_family = AF_INET;
		saddr.sin_addr.s_addr = argp->addr;
		nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state);

Admin message