[Cluster-devel] [GFS2 PATCH v3 05/14] GFS2: Reintroduce a timeout in function gfs2_gl_hash_clear

[Steven Whitehouse <swhiteho@redhat.com>]

Hi,

Acked-by: Steven Whitehouse <swhiteho@redhat.com>

Steve.

On 22/10/15 20:30, Bob Peterson wrote:
> At some point in the past, we used to have a timeout when GFS2 was
> unmounting, trying to clear out its glocks. If the timeout expires,
> it would dump the remaining glocks to the kernel messages so that
> developers can debug the problem. That timeout was eliminated,
> probably by accident. This patch reintroduces it.
>
> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
> ---
>   fs/gfs2/glock.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
> index 9bd1244..c352359 100644
> --- a/fs/gfs2/glock.c
> +++ b/fs/gfs2/glock.c
> @@ -1506,7 +1506,9 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp)
>   	flush_workqueue(glock_workqueue);
>   	glock_hash_walk(clear_glock, sdp);
>   	flush_workqueue(glock_workqueue);
> -	wait_event(sdp->sd_glock_wait, atomic_read(&sdp->sd_glock_disposal) == 0);
> +	wait_event_timeout(sdp->sd_glock_wait,
> +			   atomic_read(&sdp->sd_glock_disposal) == 0,
> +			   HZ * 600);
>   	glock_hash_walk(dump_glock_func, sdp);
>   }
>