2 files changed, 4 insertions, 3 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 3ce2702d0368..510ebcf485f0 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -551,7 +551,7 @@ retry:
                         if (strlen(pos->sm_name) != hostname_len
                          || memcmp(pos->sm_name, hostname, hostname_len))
                                 continue;
-                } else if (!nlm_cmp_addr(&pos->sm_addr, sin))
+                } else if (!nlm_cmp_addr(nsm_addr_in(pos), sin))
                         continue;
                 atomic_inc(&pos->sm_count);
                 kfree(nsm);
@@ -571,7 +571,8 @@ retry:
         if (nsm == NULL)
                 return NULL;
 
-        nsm->sm_addr = *sin;
+        memcpy(nsm_addr(nsm), sin, sizeof(*sin));
+        nsm->sm_addrlen = sizeof(*sin);
         nsm->sm_name = (char *) (nsm + 1);
         memcpy(nsm->sm_name, hostname, hostname_len);
         nsm->sm_name[hostname_len] = '\0';
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index e4d563543b11..4e7e958e8f67 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -51,7 +51,7 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
 
         memset(&args, 0, sizeof(args));
         args.mon_name = nsm->sm_name;
-        args.addr = nsm->sm_addr.sin_addr.s_addr;
+        args.addr = nsm_addr_in(nsm)->sin_addr.s_addr;
         args.prog = NLM_PROGRAM;
         args.vers = 3;
         args.proc = NLMPROC_NSM_NOTIFY;