The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.1.1.vz7.37.22
------>
commit 118f85ebd4b9e495b9afd77ddc4b44ef2659570e
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Tue Nov 7 13:25:10 2017 +0300
Revert "nfs: protect callback execution against per-net callback thread
shutdown"
This reverts commit 1164badab1522ad0c93076203fcf231cc846139f.
The patch introduces another deadlock => rool back it for now.
https://jira.sw.ru/browse/PSBM-75751
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
---
fs/nfs/callback.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 82e8ed1..0beb275 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -118,7 +118,6 @@ nfs41_callback_svc(void *vrqstp)
continue;
prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);
- mutex_lock(&nfs_callback_mutex);
spin_lock_bh(&serv->sv_cb_lock);
if (!list_empty(&serv->sv_cb_list)) {
req = list_first_entry(&serv->sv_cb_list,
@@ -130,10 +129,8 @@ nfs41_callback_svc(void *vrqstp)
error = bc_svc_process(serv, req, rqstp);
dprintk("bc_svc_process() returned w/ error code= %d\n",
error);
- mutex_unlock(&nfs_callback_mutex);
} else {
spin_unlock_bh(&serv->sv_cb_lock);
- mutex_unlock(&nfs_callback_mutex);
schedule();
finish_wait(&serv->sv_cb_waitq, &wq);
}
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
