[Cluster-devel] [GFS2 Patch] GFS2: Remove redundant metadata block type check

[Steven Whitehouse]

Hi,

On Fri, 2012-04-27 at 08:40 -0400, Bob Peterson wrote:
> Hi,
> 
> This patch removes a redundant metadata block check. See description below.
> 
> Regards,
> 
Now pushed to the -nmw git tree. Sorry for the delay,

Steve.

> Bob Peterson
> Red Hat File Systems
> 
> Signed-off-by: Bob Peterson <rpeterso at redhat.com> 
> ---
> Author: Bob Peterson <rpeterso at redhat.com>
> Date:   Fri Apr 27 07:33:08 2012 -0500
> 
> GFS2: Remove redundant metadata block type check
>  
> Function gfs2_inode_refresh calls gfs2_meta_inode_buffer, which itself
> calls gfs2_meta_indirect_buffer with height 0. Since this path through
> gfs2_meta_indirect_buffer makes a call to gfs2_metatype_check, the
> call in gfs2_inode_refresh is redundant and just a waste of time.
> This patch removes it.
> 
> diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
> index cd3e6fb..4bdcf37 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -378,11 +378,6 @@ int gfs2_inode_refresh(struct gfs2_inode *ip)
>  	if (error)
>  		return error;
>  
> -	if (gfs2_metatype_check(GFS2_SB(&ip->i_inode), dibh, GFS2_METATYPE_DI)) {
> -		brelse(dibh);
> -		return -EIO;
> -	}
> -
>  	error = gfs2_dinode_in(ip, dibh->b_data);
>  	brelse(dibh);
>  	clear_bit(GIF_INVALID, &ip->i_flags);
>