From 519be583100dca038d9cdb3ac42e9958fec1ab01 Mon Sep 17 00:00:00 2001 From: Bob Peterson Date: Thu, 9 Aug 2012 12:48:45 -0500 Subject: [PATCH] --- yaml --- r: 323274 b: refs/heads/master c: 81e1d45061d09f296d7664af70d3334840d123a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/gfs2/glock.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5db8bc557c72..b1d3287cdc3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07a790494260e102eb42840537af82e84d2ab766 +refs/heads/master: 81e1d45061d09f296d7664af70d3334840d123a0 diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c index 5c8790960735..fca6a873dcf3 100644 --- a/trunk/fs/gfs2/glock.c +++ b/trunk/fs/gfs2/glock.c @@ -890,12 +890,6 @@ int gfs2_glock_wait(struct gfs2_holder *gh) return gh->gh_error; } -static void wait_on_demote(struct gfs2_glock *gl) -{ - might_sleep(); - wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE); -} - /** * handle_callback - process a demote request * @gl: the glock @@ -1123,7 +1117,8 @@ void gfs2_glock_dq_wait(struct gfs2_holder *gh) { struct gfs2_glock *gl = gh->gh_gl; gfs2_glock_dq(gh); - wait_on_demote(gl); + might_sleep(); + wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE); } /**