Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e148582e10a2c1a23dfc09210df4a18bc6cca4e9 Commit: e148582e10a2c1a23dfc09210df4a18bc6cca4e9 Parent: a6a352e93dfa78db8903f0e3610abb76efbf7fc9 Author: Trond Myklebust <[EMAIL PROTECTED]> AuthorDate: Wed Dec 13 16:43:13 2006 -0500 Committer: Trond Myklebust <[EMAIL PROTECTED]> CommitDate: Sat Feb 3 15:35:08 2007 -0800
NFSv4: Add lockdep checks to nfs4_wait_clnt_recover() Attempt to detect deadlocks due to caller holding locks on clp->cl_sem Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]> --- fs/nfs/nfs4proc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 35bfcce..1712d03 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2711,11 +2711,15 @@ static int nfs4_wait_clnt_recover(struct rpc_clnt *clnt, struct nfs_client *clp) might_sleep(); + rwsem_acquire(&clp->cl_sem.dep_map, 0, 0, _RET_IP_); + rpc_clnt_sigmask(clnt, &oldset); res = wait_on_bit(&clp->cl_state, NFS4CLNT_STATE_RECOVER, nfs4_wait_bit_interruptible, TASK_INTERRUPTIBLE); rpc_clnt_sigunmask(clnt, &oldset); + + rwsem_release(&clp->cl_sem.dep_map, 1, _RET_IP_); return res; } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html