Эх сурвалжийг харах

The rpc server does not require that service threads take the BKL.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
J. Bruce Fields 15 жил өмнө
parent
commit
d4e935bd67
1 өөрчлөгдсөн 0 нэмэгдсэн , 12 устгасан
  1. 0 12
      fs/nfs/callback.c

+ 0 - 12
fs/nfs/callback.c

@@ -78,11 +78,6 @@ nfs4_callback_svc(void *vrqstp)
 
 
 	set_freezable();
 	set_freezable();
 
 
-	/*
-	 * FIXME: do we really need to run this under the BKL? If so, please
-	 * add a comment about what it's intended to protect.
-	 */
-	lock_kernel();
 	while (!kthread_should_stop()) {
 	while (!kthread_should_stop()) {
 		/*
 		/*
 		 * Listen for a request on the socket
 		 * Listen for a request on the socket
@@ -104,7 +99,6 @@ nfs4_callback_svc(void *vrqstp)
 		preverr = err;
 		preverr = err;
 		svc_process(rqstp);
 		svc_process(rqstp);
 	}
 	}
-	unlock_kernel();
 	return 0;
 	return 0;
 }
 }
 
 
@@ -160,11 +154,6 @@ nfs41_callback_svc(void *vrqstp)
 
 
 	set_freezable();
 	set_freezable();
 
 
-	/*
-	 * FIXME: do we really need to run this under the BKL? If so, please
-	 * add a comment about what it's intended to protect.
-	 */
-	lock_kernel();
 	while (!kthread_should_stop()) {
 	while (!kthread_should_stop()) {
 		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);
 		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);
 		spin_lock_bh(&serv->sv_cb_lock);
 		spin_lock_bh(&serv->sv_cb_lock);
@@ -183,7 +172,6 @@ nfs41_callback_svc(void *vrqstp)
 		}
 		}
 		finish_wait(&serv->sv_cb_waitq, &wq);
 		finish_wait(&serv->sv_cb_waitq, &wq);
 	}
 	}
-	unlock_kernel();
 	return 0;
 	return 0;
 }
 }