From 79351f35e45807006e590468643a97223b74b417 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 23 Oct 2008 00:50:35 -0400 Subject: [PATCH] --- yaml --- r: 118287 b: refs/heads/master c: d7dc61d0a70371b1c6557ea8ffbc60fff94c8168 h: refs/heads/master i: 118285: d58b652ad69c1c896f549efb2bec878e708a94ed 118283: 3f53287258edda0f28051e438edd3cf68df48c61 118279: d88577e80f756b4a5e4d8b604514233fa0a72637 118271: 60355098a39bb53d4505c47ce80321abeff812e5 v: v3 --- [refs] | 2 +- trunk/fs/lockd/svc4proc.c | 1 + trunk/fs/lockd/svcproc.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index edefce2dda5a..d19bf554a6a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d7c4203c681a3ec359eccff4e53bc8c0ccf403b +refs/heads/master: d7dc61d0a70371b1c6557ea8ffbc60fff94c8168 diff --git a/trunk/fs/lockd/svc4proc.c b/trunk/fs/lockd/svc4proc.c index 014f6ce48172..4dfdcbc6bf68 100644 --- a/trunk/fs/lockd/svc4proc.c +++ b/trunk/fs/lockd/svc4proc.c @@ -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); diff --git a/trunk/fs/lockd/svcproc.c b/trunk/fs/lockd/svcproc.c index 548b0bb2b84d..3ca89e2a9381 100644 --- a/trunk/fs/lockd/svcproc.c +++ b/trunk/fs/lockd/svcproc.c @@ -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);