X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Flockd%2Fsvcproc.c;h=76019d2ff72def49828cf78ad6dba73b728fc8de;hb=1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526;hp=e099f589b61b1eeae749f8ca1bf0d375b872c733;hpb=8f920d5e29f86d3425a68e1c3bc264d1f6f55112;p=~andy%2Flinux

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index e099f589b61..76019d2ff72 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -175,7 +175,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 #endif
 
 	/* Now try to lock the file */
-	resp->status = cast_status(nlmsvc_lock(rqstp, file, &argp->lock,
+	resp->status = cast_status(nlmsvc_lock(rqstp, file, host, &argp->lock,
 					       argp->block, &argp->cookie));
 	if (resp->status == nlm_drop_reply)
 		rc = rpc_drop_reply;
@@ -277,7 +277,9 @@ static void nlmsvc_callback_exit(struct rpc_task *task, void *data)
 
 static void nlmsvc_callback_release(void *data)
 {
+	lock_kernel();
 	nlm_release_call(data);
+	unlock_kernel();
 }
 
 static const struct rpc_call_ops nlmsvc_callback_ops = {