[Ocfs2-devel] [PATCH 6/6] ocfs2/dlm: dlm_thread should not sleep while holding the dlm_spinlock

[Joel Becker]

On Sat, Mar 01, 2008 at 02:04:25PM -0800, Sunil Mushran wrote:
> This patch addresses the bug in which the dlm_thread could go to sleep
> while holding the dlm_spinlock.
> 
> Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>

> ---
>  fs/ocfs2/dlm/dlmthread.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
> index cebd089..4060bb3 100644
> --- a/fs/ocfs2/dlm/dlmthread.c
> +++ b/fs/ocfs2/dlm/dlmthread.c
> @@ -176,12 +176,14 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm,
>  	     res->lockname.name, master);
>  
>  	if (!master) {
> +		/* drop spinlock...  retake below */
> +		spin_unlock(&dlm->spinlock);
> +
>  		spin_lock(&res->spinlock);
>  		/* This ensures that clear refmap is sent after the set */
>  		__dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG);
>  		spin_unlock(&res->spinlock);
> -		/* drop spinlock to do messaging, retake below */
> -		spin_unlock(&dlm->spinlock);
> +
>  		/* clear our bit from the master's refmap, ignore errors */
>  		ret = dlm_drop_lockres_ref(dlm, res);
>  		if (ret < 0) {
> -- 
> 1.5.3.6
> 
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel

-- 

"This is the end, beautiful friend.
 This is the end, my only friend the end
 Of our elaborate plans, the end
 Of everything that stands, the end
 No safety or surprise, the end
 I'll never look into your eyes again."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127