[Cluster-devel] [GFS2 PATCH] GFS2: Get rid of dead code in inode_go_demote_ok

[Cluster-devel] [GFS2 PATCH] GFS2: Get rid of dead code in inode_go_demote_ok

[Bob Peterson]

Hi,

Function inode_go_demote_ok had some code that was only executed
if gl_holders was not empty. However, if gl_holders was not empty,
the only caller, demote_ok(), returns before inode_go_demote_ok
would ever be called. Therefore, it's dead code, so I removed it.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 437fd73..5db59d4 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -286,17 +286,10 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)
 static int inode_go_demote_ok(const struct gfs2_glock *gl)
 {
 	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
-	struct gfs2_holder *gh;
 
 	if (sdp->sd_jindex == gl->gl_object || sdp->sd_rindex == gl->gl_object)
 		return 0;
 
-	if (!list_empty(&gl->gl_holders)) {
-		gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list);
-		if (gh->gh_list.next != &gl->gl_holders)
-			return 0;
-	}
-
 	return 1;
 }
 

[Cluster-devel] [GFS2 PATCH] GFS2: Get rid of dead code in inode_go_demote_ok

[Steven Whitehouse]

Looks like a useful clean up.

Acked-by: Steven Whitehouse <swhiteho@redhat.com>

Steve.

On 01/04/16 18:26, Bob Peterson wrote:
> Hi,
>
> Function inode_go_demote_ok had some code that was only executed
> if gl_holders was not empty. However, if gl_holders was not empty,
> the only caller, demote_ok(), returns before inode_go_demote_ok
> would ever be called. Therefore, it's dead code, so I removed it.
>
> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
> ---
> diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
> index 437fd73..5db59d4 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -286,17 +286,10 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)
>   static int inode_go_demote_ok(const struct gfs2_glock *gl)
>   {
>   	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
> -	struct gfs2_holder *gh;
>   
>   	if (sdp->sd_jindex == gl->gl_object || sdp->sd_rindex == gl->gl_object)
>   		return 0;
>   
> -	if (!list_empty(&gl->gl_holders)) {
> -		gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list);
> -		if (gh->gh_list.next != &gl->gl_holders)
> -			return 0;
> -	}
> -
>   	return 1;
>   }
>   
>