diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2012-08-09 12:48:45 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-09-24 10:47:10 +0100 |
| commit | 81e1d45061d09f296d7664af70d3334840d123a0 (patch) | |
| tree | 0ecb235ad73de100e81d3b20a1b08a44b827a1d8 /fs/gfs2 | |
| parent | 07a790494260e102eb42840537af82e84d2ab766 (diff) | |
| download | linux-stable-81e1d45061d09f296d7664af70d3334840d123a0.tar.gz linux-stable-81e1d45061d09f296d7664af70d3334840d123a0.tar.bz2 linux-stable-81e1d45061d09f296d7664af70d3334840d123a0.zip | |
GFS2: Combine functions gfs2_glock_dq_wait and wait_on_demote
Function gfs2_glock_dq_wait called two-line function wait_on_demote,
so they were combined.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/glock.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 5c8790960735..fca6a873dcf3 100644 --- a/fs/gfs2/glock.c +++ b/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); } /** |