summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2017-08-04 07:40:45 -0500
committerBob Peterson <rpeterso@redhat.com>2017-08-10 10:51:02 -0500
commita91323e255fa8bc84b0acf63376b395c534a38fa (patch)
treef193b2fd5dbe00591267426cf09021bb599d35d1 /fs/gfs2
parent6a1c8f6dcf815d96197a2723781cf700925d17ed (diff)
downloadlinux-a91323e255fa8bc84b0acf63376b395c534a38fa.tar.bz2
gfs2: Clean up waiting on glocks
The prepare_to_wait_on_glock and finish_wait_on_glock functions introduced in commit 56a365be "gfs2: gfs2_glock_get: Wait on freeing glocks" are better removed, resulting in cleaner code. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/glock.c27
1 files changed, 7 insertions, 20 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 5ad757f0ce60..ffca19598525 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -112,23 +112,6 @@ static wait_queue_head_t *glock_waitqueue(struct lm_lockname *name)
return glock_wait_table + hash_32(hash, GLOCK_WAIT_TABLE_BITS);
}
-static void prepare_to_wait_on_glock(wait_queue_head_t **wq,
- struct wait_glock_queue *wait,
- struct lm_lockname *name)
-{
- wait->name = name;
- init_wait(&wait->wait);
- wait->wait.func = glock_wake_function;
- *wq = glock_waitqueue(name);
- prepare_to_wait(*wq, &wait->wait, TASK_UNINTERRUPTIBLE);
-}
-
-static void finish_wait_on_glock(wait_queue_head_t *wq,
- struct wait_glock_queue *wait)
-{
- finish_wait(wq, &wait->wait);
-}
-
/**
* wake_up_glock - Wake up waiters on a glock
* @gl: the glock
@@ -754,11 +737,15 @@ static struct gfs2_glock *find_insert_glock(struct lm_lockname *name,
struct gfs2_glock *new)
{
struct wait_glock_queue wait;
- wait_queue_head_t *wq;
+ wait_queue_head_t *wq = glock_waitqueue(name);
struct gfs2_glock *gl;
+ wait.name = name;
+ init_wait(&wait.wait);
+ wait.wait.func = glock_wake_function;
+
again:
- prepare_to_wait_on_glock(&wq, &wait, name);
+ prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE);
rcu_read_lock();
if (new) {
gl = rhashtable_lookup_get_insert_fast(&gl_hash_table,
@@ -776,7 +763,7 @@ again:
}
out:
rcu_read_unlock();
- finish_wait_on_glock(wq, &wait);
+ finish_wait(wq, &wait.wait);
return gl;
}