[Ocfs2-tools-devel] [PATCH] ocfs2-tools: fix ia64 build

Mark Fasheh mfasheh at suse.com
Fri Oct 24 16:03:16 PDT 2008


sa_restorer isn't defined on ia64, and is obsoleted anyway. Just initialize
the sa_handler field of our sigaction at the top of setup_sigpipe() in
ocfs2_controld/main.c to get around this.

Signed-off-by: Mark Fasheh <mfasheh at suse.com>
---
 ocfs2_controld/main.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/ocfs2_controld/main.c b/ocfs2_controld/main.c
index 4f70ced..4ac8bb2 100644
--- a/ocfs2_controld/main.c
+++ b/ocfs2_controld/main.c
@@ -204,7 +204,7 @@ static int setup_sigpipe(void)
 {
 	int rc;
 	int signal_pipe[2];
-	struct sigaction act;
+	struct sigaction act = { .sa_handler = handler, };
 
 	rc = pipe(signal_pipe);
 	if (rc) {
@@ -216,10 +216,7 @@ static int setup_sigpipe(void)
 
 	sigpipe_write_fd = signal_pipe[1];
 
-	act.sa_sigaction = NULL;
-	act.sa_restorer = NULL;
 	sigemptyset(&act.sa_mask);
-	act.sa_handler = handler;
 #ifdef SA_INTERRUPT
 	act.sa_flags = SA_INTERRUPT;
 #endif
-- 
1.5.6




More information about the Ocfs2-tools-devel mailing list