Commit a00181e0 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] PATCH 7/16: NFSD: BKL removal: Discard high level BKL locking

Remove last unneeded bit of BKL from knfsd

Remove BKL from nfsservctl systemcall.  All
components have their own locking.
Also remove it from the body of nfsd threads.  Keep
it for final thread destruction though.
parent fd5cdcf8
...@@ -187,7 +187,6 @@ asmlinkage handle_sys_nfsservctl(int cmd, void *opaque_argp, void *opaque_resp) ...@@ -187,7 +187,6 @@ asmlinkage handle_sys_nfsservctl(int cmd, void *opaque_argp, void *opaque_resp)
int err; int err;
int argsize, respsize; int argsize, respsize;
lock_kernel ();
err = -EPERM; err = -EPERM;
if (!capable(CAP_SYS_ADMIN)) { if (!capable(CAP_SYS_ADMIN)) {
...@@ -257,7 +256,6 @@ asmlinkage handle_sys_nfsservctl(int cmd, void *opaque_argp, void *opaque_resp) ...@@ -257,7 +256,6 @@ asmlinkage handle_sys_nfsservctl(int cmd, void *opaque_argp, void *opaque_resp)
if (res) if (res)
kfree(res); kfree(res);
unlock_kernel ();
return err; return err;
} }
......
...@@ -179,6 +179,7 @@ nfsd(struct svc_rqst *rqstp) ...@@ -179,6 +179,7 @@ nfsd(struct svc_rqst *rqstp)
me.task = current; me.task = current;
list_add(&me.list, &nfsd_list); list_add(&me.list, &nfsd_list);
unlock_kernel();
/* /*
* The main request loop * The main request loop
*/ */
...@@ -234,6 +235,8 @@ nfsd(struct svc_rqst *rqstp) ...@@ -234,6 +235,8 @@ nfsd(struct svc_rqst *rqstp)
err = signo; err = signo;
} }
lock_kernel();
/* Release lockd */ /* Release lockd */
lockd_down(); lockd_down();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment