From 643dd22ad0cdd9b298bae76e18c1127298ccec21 Mon Sep 17 00:00:00 2001
From: girish <girish>
Date: Tue, 29 Jul 2008 16:23:42 +0000
Subject: [PATCH] Cleanup compiler warnings. b=15981 i=adilger i=robert.read
---
lustre/ptlrpc/pack_generic.c | 2 +-
lustre/ptlrpc/service.c | 2 +-
lustre/utils/ll_recover_lost_found_objs.c | 2 ++
lustre/utils/lr_reader.c | 2 ++
lustre/utils/mkfs_lustre.c | 2 ++
lustre/utils/mount_lustre.c | 3 ++-
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 5dc810dd50..c642f2b1b9 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -1685,7 +1685,7 @@ __u32 lustre_msg_calc_cksum(struct lustre_msg *msg)
struct ptlrpc_body *pb;
pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
- return crc32_le(~(__u32)0, (char *)pb, sizeof(*pb));
+ return crc32_le(~(__u32)0, (unsigned char *)pb, sizeof(*pb));
}
default:
CERROR("incorrect message magic: %08x\n", msg->lm_magic);
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 850dbce194..93c1eaf6ee 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -611,7 +611,7 @@ static void ptlrpc_at_set_timer(struct ptlrpc_service *svc)
else
cfs_timer_arm(&svc->srv_at_timer, cfs_time_shift(next));
spin_unlock(&svc->srv_at_lock);
- CDEBUG(D_INFO, "armed %s at %+lds\n", svc->srv_name, next);
+ CDEBUG(D_INFO, "armed %s at %+ds\n", svc->srv_name, next);
}
/* Add rpc to early reply check list */
diff --git a/lustre/utils/ll_recover_lost_found_objs.c b/lustre/utils/ll_recover_lost_found_objs.c
index 0892363aec..6c434fbdc9 100644
--- a/lustre/utils/ll_recover_lost_found_objs.c
+++ b/lustre/utils/ll_recover_lost_found_objs.c
@@ -43,7 +43,9 @@
* Author: Kalpak Shah <kalpak.shah@sun.com>
*/
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <stdio.h>
#include <stdlib.h>
diff --git a/lustre/utils/lr_reader.c b/lustre/utils/lr_reader.c
index 084b856c28..b44d6b55d3 100644
--- a/lustre/utils/lr_reader.c
+++ b/lustre/utils/lr_reader.c
@@ -39,7 +39,9 @@
*/
/* Safely read the last_rcvd file from a device */
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 340b7e4bde..22a0c837ee 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -40,7 +40,9 @@
/* This source file is compiled into both mkfs.lustre and tunefs.lustre */
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 2d244b3200..c1ed6455de 100644
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -39,8 +39,9 @@
* Author: Nathan Rutman <nathan@clusterfs.com>
*/
-
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
--
GitLab