1 files changed, 10 insertions, 1 deletions

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index a89cb8aa2c88..3fc683f46b3e 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -35,6 +35,10 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)
         struct rpc_clnt *clnt;
         int             status;
         struct nsm_args args;
+        struct rpc_message msg = {
+                .rpc_argp       = &args,
+                .rpc_resp       = res,
+        };
 
         clnt = nsm_create();
         if (IS_ERR(clnt)) {
@@ -49,7 +53,8 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)
         args.proc = NLMPROC_NSM_NOTIFY;
         memset(res, 0, sizeof(*res));
 
-        status = rpc_call(clnt, proc, &args, res, 0);
+        msg.rpc_proc = &clnt->cl_procinfo[proc];
+        status = rpc_call_sync(clnt, &msg, 0);
         if (status < 0)
                 printk(KERN_DEBUG "nsm_mon_unmon: rpc failed, status=%d\n",
                         status);
@@ -214,12 +219,16 @@ static struct rpc_procinfo	nsm_procedures[] = {
                 .p_encode       = (kxdrproc_t) xdr_encode_mon,
                 .p_decode       = (kxdrproc_t) xdr_decode_stat_res,
                 .p_bufsiz       = MAX(SM_mon_sz, SM_monres_sz) << 2,
+                .p_statidx      = SM_MON,
+                .p_name         = "MONITOR",
         },
 [SM_UNMON] = {
                 .p_proc         = SM_UNMON,
                 .p_encode       = (kxdrproc_t) xdr_encode_unmon,
                 .p_decode       = (kxdrproc_t) xdr_decode_stat,
                 .p_bufsiz       = MAX(SM_mon_id_sz, SM_unmonres_sz) << 2,
+                .p_statidx      = SM_UNMON,
+                .p_name         = "UNMONITOR",
         },
 };