1 files changed, 11 insertions, 6 deletions

diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 200fbda2c6d1..766ce06146b5 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -131,10 +131,11 @@ nlm_decode_lock(u32 *p, struct nlm_lock *lock)
          || !(p = nlm_decode_fh(p, &lock->fh))
          || !(p = nlm_decode_oh(p, &lock->oh)))
                 return NULL;
+        lock->svid  = ntohl(*p++);
 
         locks_init_lock(fl);
         fl->fl_owner = current->files;
-        fl->fl_pid   = ntohl(*p++);
+        fl->fl_pid   = (pid_t)lock->svid;
         fl->fl_flags = FL_POSIX;
         fl->fl_type  = F_RDLCK;         /* as good as anything else */
         start = ntohl(*p++);
@@ -174,7 +175,7 @@ nlm_encode_lock(u32 *p, struct nlm_lock *lock)
         else
                 len = loff_t_to_s32(fl->fl_end - fl->fl_start + 1);
 
-        *p++ = htonl(fl->fl_pid);
+        *p++ = htonl(lock->svid);
         *p++ = htonl(start);
         *p++ = htonl(len);
 
@@ -197,7 +198,7 @@ nlm_encode_testres(u32 *p, struct nlm_res *resp)
                 struct file_lock        *fl = &resp->lock.fl;
 
                 *p++ = (fl->fl_type == F_RDLCK)? xdr_zero : xdr_one;
-                *p++ = htonl(fl->fl_pid);
+                *p++ = htonl(resp->lock.svid);
 
                 /* Encode owner handle. */
                 if (!(p = xdr_encode_netobj(p, &resp->lock.oh)))
@@ -298,7 +299,8 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp)
 
         memset(lock, 0, sizeof(*lock));
         locks_init_lock(&lock->fl);
-        lock->fl.fl_pid = ~(u32) 0;
+        lock->svid = ~(u32) 0;
+        lock->fl.fl_pid = (pid_t)lock->svid;
 
         if (!(p = nlm_decode_cookie(p, &argp->cookie))
          || !(p = xdr_decode_string_inplace(p, &lock->caller,
@@ -415,7 +417,8 @@ nlmclt_decode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp)
                 memset(&resp->lock, 0, sizeof(resp->lock));
                 locks_init_lock(fl);
                 excl = ntohl(*p++);
-                fl->fl_pid = ntohl(*p++);
+                resp->lock.svid = ntohl(*p++);
+                fl->fl_pid = (pid_t)resp->lock.svid;
                 if (!(p = nlm_decode_oh(p, &resp->lock.oh)))
                         return -EIO;
 
@@ -543,7 +546,9 @@ nlmclt_decode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp)
         .p_proc      = NLMPROC_##proc,                                  \
         .p_encode    = (kxdrproc_t) nlmclt_encode_##argtype,            \
         .p_decode    = (kxdrproc_t) nlmclt_decode_##restype,            \
-        .p_bufsiz    = MAX(NLM_##argtype##_sz, NLM_##restype##_sz) << 2 \
+        .p_bufsiz    = MAX(NLM_##argtype##_sz, NLM_##restype##_sz) << 2,        \
+        .p_statidx   = NLMPROC_##proc,                                  \
+        .p_name      = #proc,                                           \
         }
 
 static struct rpc_procinfo      nlm_procedures[] = {