[Cluster-devel] [GFS2 PATCH] GFS2: Rename glops go_xmote_th to go_sync

[Steven Whitehouse]

Hi,

On Wed, 2012-10-24 at 14:41 -0400, Bob Peterson wrote:
> Hi,
> 
> [Editorial: This is a nit, but has been a minor irritation for a long time:]
> 
> This patch renames glops structure item for go_xmote_th to go_sync.
> The functionality is unchanged; it's just for readability.
> 
Yes, that should make it rather less confusing. Applied to the -nmw
tree. Thanks,

Steve.

> Regards,
> 
> Bob Peterson
> Red Hat File Systems
> 
> Signed-off-by: Bob Peterson <rpeterso at redhat.com> 
> ---
> diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
> index e543871..6114571 100644
> --- a/fs/gfs2/glock.c
> +++ b/fs/gfs2/glock.c
> @@ -535,8 +535,8 @@ __acquires(&gl->gl_spin)
>  	    (lck_flags & (LM_FLAG_TRY|LM_FLAG_TRY_1CB)))
>  		clear_bit(GLF_BLOCKING, &gl->gl_flags);
>  	spin_unlock(&gl->gl_spin);
> -	if (glops->go_xmote_th)
> -		glops->go_xmote_th(gl);
> +	if (glops->go_sync)
> +		glops->go_sync(gl);
>  	if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags))
>  		glops->go_inval(gl, target == LM_ST_DEFERRED ? 0 : DIO_METADATA);
>  	clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
> diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
> index 0a3e7c7..e86fe26 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -536,7 +536,7 @@ const struct gfs2_glock_operations gfs2_meta_glops = {
>  };
>  
>  const struct gfs2_glock_operations gfs2_inode_glops = {
> -	.go_xmote_th = inode_go_sync,
> +	.go_sync = inode_go_sync,
>  	.go_inval = inode_go_inval,
>  	.go_demote_ok = inode_go_demote_ok,
>  	.go_lock = inode_go_lock,
> @@ -546,7 +546,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = {
>  };
>  
>  const struct gfs2_glock_operations gfs2_rgrp_glops = {
> -	.go_xmote_th = rgrp_go_sync,
> +	.go_sync = rgrp_go_sync,
>  	.go_inval = rgrp_go_inval,
>  	.go_lock = gfs2_rgrp_go_lock,
>  	.go_unlock = gfs2_rgrp_go_unlock,
> @@ -556,7 +556,7 @@ const struct gfs2_glock_operations gfs2_rgrp_glops = {
>  };
>  
>  const struct gfs2_glock_operations gfs2_trans_glops = {
> -	.go_xmote_th = trans_go_sync,
> +	.go_sync = trans_go_sync,
>  	.go_xmote_bh = trans_go_xmote_bh,
>  	.go_demote_ok = trans_go_demote_ok,
>  	.go_type = LM_TYPE_NONDISK,
> diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
> index 24bb0b8..a46f034 100644
> --- a/fs/gfs2/incore.h
> +++ b/fs/gfs2/incore.h
> @@ -205,7 +205,7 @@ struct lm_lockname {
>  
> 
>  struct gfs2_glock_operations {
> -	void (*go_xmote_th) (struct gfs2_glock *gl);
> +	void (*go_sync) (struct gfs2_glock *gl);
>  	int (*go_xmote_bh) (struct gfs2_glock *gl, struct gfs2_holder *gh);
>  	void (*go_inval) (struct gfs2_glock *gl, int flags);
>  	int (*go_demote_ok) (const struct gfs2_glock *gl);
>