cluster: RHEL56 - Fix error where write_journal return code should be ignored

[Bob Peterson]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        7ccf5c0c60ff29fc6e8a1ef0fea01d510f2df79b
Parent:        20c699b363c8ddd38ad29c35a20b5978384645e6
Author:        Bob Peterson <bob(a)krishna.(none)&gt;
AuthorDate:    Wed Feb 17 13:25:42 2010 -0600
Committer:     Bob Peterson <rpeterso(a)redhat.com&gt;
CommitterDate: Fri Apr 9 23:45:34 2010 -0500

Fix error where write_journal return code should be ignored

This patch ignores the return code from write_journal.  The
function returns an int value upstream, but doesn't in RHEL5.x
so this fixes a compile error.

rhbz#455300
---
 gfs2/fsck/fs_recovery.c |    6 +++---
 gfs2/fsck/inode_hash.c  |    1 +
 gfs2/fsck/pass1b.c      |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index d5ccb75..654556c 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -553,9 +553,9 @@ out:
 	log_info( _("jid=%u: Failed\n"), j);
 reinit:
 	if (query( _("Do you want to clear the journal instead? (y/n)")))
-		error = write_journal(sdp, sdp->md.journal[j], j,
-				      sdp->md.journal[j]->i_di.di_size /
-				      sdp->sd_sb.sb_bsize);
+		write_journal(sdp, sdp->md.journal[j], j,
+			      sdp->md.journal[j]->i_di.di_size /
+			      sdp->sd_sb.sb_bsize);
 	else
 		log_err( _("jid=%u: journal not cleared.\n"), j);
 	return error;
diff --git a/gfs2/fsck/inode_hash.c b/gfs2/fsck/inode_hash.c
index b23fe08..8086abb 100644
--- a/gfs2/fsck/inode_hash.c
+++ b/gfs2/fsck/inode_hash.c
@@ -11,6 +11,7 @@
 *******************************************************************************
 ******************************************************************************/
 
+#include <string.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <libintl.h>
diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
index 5ad1e08..af814ae 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -13,6 +13,7 @@
 
 #include <inttypes.h>
 #include <linux_endian.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>