The commit is pushed to "branch-rh7-3.10.0-957.27.2.vz7.107.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.27.2.vz7.107.13
------>
commit d4437785bd5ab9972892765287b64d03a984c6cc
Author: Benjamin Coddington <[email protected]>
Date: Thu Oct 3 18:47:21 2019 +0300
ms/NFS: Fix a double unlock from nfs_match,get_client
Now that nfs_match_client drops the nfs_client_lock, we should be
careful to always return it in the same condition: locked.
Fixes: 950a578c6128 ("NFS: make nfs_match_client killable")
Reported-by: [email protected]
Signed-off-by: Benjamin Coddington <[email protected]>
Signed-off-by: Anna Schumaker <[email protected]>
https://jira.sw.ru/browse/PSBM-98297
(cherry picked from commit c260121a97a3e4df6536edbc2f26e166eff370ce)
Signed-off-by: Andrey Ryabinin <[email protected]>
---
fs/nfs/client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 24d025fcbb6a..72ddd88a2f2f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -310,9 +310,9 @@ static struct nfs_client *nfs_match_client(const struct
nfs_client_initdata *dat
spin_unlock(&nn->nfs_client_lock);
error = nfs_wait_client_init_complete(clp);
nfs_put_client(clp);
+ spin_lock(&nn->nfs_client_lock);
if (error < 0)
return ERR_PTR(error);
- spin_lock(&nn->nfs_client_lock);
goto again;
}
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
