NFS: Fix a double unlock from nfs_match,get_client

[ Upstream commit c260121 ] Now that nfs_match_client drops the nfs_client_lock, we should be careful to always return it in the same condition: locked. Fixes: 950a578 ("NFS: make nfs_match_client killable") Reported-by: [email protected] Signed-off-by: Benjamin Coddington <[email protected]> Signed-off-by: Anna Schumaker <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
multipath-tcp · May 31, 2019 · de69696 · de69696
1 parent 3d5e860
commit de69696
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
@@ -305,9 +305,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;
 		}