gfs2: Eliminate gh parameter from go_xmote_bh func

The only glock that uses go_xmote_bh glops function is the freeze glock
which uses freeze_go_xmote_bh. It does not use its gh parameter, so
this patch eliminates the unneeded parameter.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 9567520..f6f66c8 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -566,7 +566,7 @@ retry:
        if (state != LM_ST_UNLOCKED) {
                if (glops->go_xmote_bh) {
                        spin_unlock(&gl->gl_lockref.lock);
-                       rv = glops->go_xmote_bh(gl, gh);
+                       rv = glops->go_xmote_bh(gl);
                        spin_lock(&gl->gl_lockref.lock);
                        if (rv) {
                                do_error(gl, rv);

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 8e32d56..469a930 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -597,7 +597,7 @@ static int freeze_go_sync(struct gfs2_glock *gl)
  *
  */
 
-static int freeze_go_xmote_bh(struct gfs2_glock *gl, struct gfs2_holder *gh)
+static int freeze_go_xmote_bh(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
        struct gfs2_inode *ip = GFS2_I(sdp->sd_jdesc->jd_inode);

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 0957119..6e37734 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -217,7 +217,7 @@ struct lm_lockname {
 
 struct gfs2_glock_operations {
        int (*go_sync) (struct gfs2_glock *gl);
-       int (*go_xmote_bh) (struct gfs2_glock *gl, struct gfs2_holder *gh);
+       int (*go_xmote_bh)(struct gfs2_glock *gl);
        void (*go_inval) (struct gfs2_glock *gl, int flags);
        int (*go_demote_ok) (const struct gfs2_glock *gl);
        int (*go_lock) (struct gfs2_holder *gh);