This is another baby step toward a better glock state machine.
Before this patch, do_xmote was called with a gh parameter, but
only for promotes, not demotes. This patch allows do_xmote to
determine the gh autonomously.

Signed-off-by: Bob Peterson <rpete...@redhat.com>
---
 fs/gfs2/glock.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 692784faa464..5f2156f15f05 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -60,7 +60,7 @@ struct gfs2_glock_iter {
 
 typedef void (*glock_examiner) (struct gfs2_glock * gl);
 
-static void do_xmote(struct gfs2_glock *gl, struct gfs2_holder *gh, unsigned 
int target);
+static void do_xmote(struct gfs2_glock *gl, unsigned int target);
 
 static struct dentry *gfs2_root;
 static struct workqueue_struct *glock_workqueue;
@@ -486,12 +486,12 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned 
int ret)
                /* Unlocked due to conversion deadlock, try again */
                case LM_ST_UNLOCKED:
 retry:
-                       do_xmote(gl, gh, gl->gl_target);
+                       do_xmote(gl, gl->gl_target);
                        break;
                /* Conversion fails, unlock and try again */
                case LM_ST_SHARED:
                case LM_ST_DEFERRED:
-                       do_xmote(gl, gh, LM_ST_UNLOCKED);
+                       do_xmote(gl, LM_ST_UNLOCKED);
                        break;
                default: /* Everything else */
                        fs_err(gl->gl_name.ln_sbd, "wanted %u got %u\n",
@@ -528,17 +528,17 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned 
int ret)
 /**
  * do_xmote - Calls the DLM to change the state of a lock
  * @gl: The lock state
- * @gh: The holder (only for promotes)
  * @target: The target lock state
  *
  */
 
-static void do_xmote(struct gfs2_glock *gl, struct gfs2_holder *gh, unsigned 
int target)
+static void do_xmote(struct gfs2_glock *gl, unsigned int target)
 __releases(&gl->gl_lockref.lock)
 __acquires(&gl->gl_lockref.lock)
 {
        const struct gfs2_glock_operations *glops = gl->gl_ops;
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
+       struct gfs2_holder *gh = find_first_waiter(gl);
        unsigned int lck_flags = (unsigned int)(gh ? gh->gh_flags : 0);
        int ret;
 
@@ -659,7 +659,7 @@ __acquires(&gl->gl_lockref.lock)
                if (!(gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))
                        do_error(gl, 0); /* Fail queued try locks */
        }
-       do_xmote(gl, gh, gl->gl_target);
+       do_xmote(gl, gl->gl_target);
        return;
 }
 
-- 
2.19.1

Reply via email to