[Cluster-devel] [GFS2 PATCH 1/3] gfs2: switch go_xmote_bh glop to pass gh not gl

[Andreas Gruenbacher]

On Tue, Aug 24, 2021 at 4:02 PM Bob Peterson <rpeterso at redhat.com> wrote:
> Before this patch, the go_xmote_bh function was passed gl, the glock
> pointer. This patch switches it to gh, the holder, which points to the gl.
> This facilitates improvements for the next patch.
>
> Signed-off-by: Bob Peterson <rpeterso at redhat.com>
> ---
>  fs/gfs2/glock.c  | 4 ++--
>  fs/gfs2/glops.c  | 5 +++--
>  fs/gfs2/incore.h | 2 +-
>  3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
> index e0eaa9cf9fb6..d43eed1696ab 100644
> --- a/fs/gfs2/glock.c
> +++ b/fs/gfs2/glock.c
> @@ -562,9 +562,9 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret)
>         if (test_and_clear_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags))
>                 gfs2_demote_wake(gl);
>         if (state != LM_ST_UNLOCKED) {
> -               if (glops->go_xmote_bh) {
> +               if (gh && glops->go_xmote_bh) {

This changes when the callback is called. Please explain why that's okay.

>                         spin_unlock(&gl->gl_lockref.lock);
> -                       rv = glops->go_xmote_bh(gl);
> +                       rv = glops->go_xmote_bh(gh);
>                         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 79c621c7863d..6d0770564493 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -598,10 +598,11 @@ static int freeze_go_sync(struct gfs2_glock *gl)
>
>  /**
>   * freeze_go_xmote_bh - After promoting/demoting the freeze glock
> - * @gl: the glock
> + * @gh: the holder of the glock
>   */
> -static int freeze_go_xmote_bh(struct gfs2_glock *gl)
> +static int freeze_go_xmote_bh(struct gfs2_holder *gh)
>  {
> +       struct gfs2_glock *gl = gh->gh_gl;
>         struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
>         struct gfs2_inode *ip = GFS2_I(sdp->sd_jdesc->jd_inode);
>         struct gfs2_glock *j_gl = ip->i_gl;
> diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
> index 0fe49770166e..354d6230d0f7 100644
> --- 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);
> +       int (*go_xmote_bh)(struct gfs2_holder *gh);
>         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);
> --
> 2.31.1
>

Thanks,
Andreas