cluster: STABLE3 - Get rid of build warning in gfs2_convert.

Fabio M. Di Nitto fabbione@fedoraproject.org
Thu Feb 19 10:32:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=47f32bf33ad1f7981d34df8aeadc3abfdd0272be
Commit:        47f32bf33ad1f7981d34df8aeadc3abfdd0272be
Parent:        b1ea15c55e5ac33251caf76f82dcae9ceb986aa1
Author:        Bob Peterson <rpeterso@redhat.com>
AuthorDate:    Tue Jan 27 09:29:36 2009 -0600
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Feb 19 10:59:57 2009 +0100

Get rid of build warning in gfs2_convert.

---
 gfs2/convert/gfs2_convert.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 5e396a5..98b8c2b 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -242,7 +242,7 @@ struct gfs2_buffer_head *find_lbh(struct gfs2_sbd *sbp,
 {
 	struct gfs2_buffer_head *bh;
 	osi_list_t *head, *tmp;
-	struct blocklist *blk;
+	struct blocklist *blk = NULL;
 
 	head = &blist->list;
 
@@ -253,6 +253,10 @@ struct gfs2_buffer_head *find_lbh(struct gfs2_sbd *sbp,
 			return bh;
 		}
 	}
+	/* If there's no first entry, just return NULL.  Otherwise blk
+	   should be left as the last entry on the list. */
+	if (!blk)
+		return NULL;
 	/* We didn't find one that has the same offset, so let's just reuse
 	   a bh from the same height */
 	blk->lbparent = lblock;



More information about the Cluster-cvs mailing list