From 4d66a72a5a0be6f50f1078b95e69a8f0bb3190a5 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Jun 2010 10:51:40 -0700
Subject: [PATCH] ceph: fix straggler header ifdef guards

---
 src/ebofs/csum.h        | 4 ++--
 src/include/atomic.h    | 4 ++--
 src/include/ceph_frag.h | 4 ++--
 src/include/ceph_hash.h | 4 ++--
 src/include/inttypes.h  | 4 ++--
 src/include/rbd_types.h | 4 ++--
 src/include/types.h     | 4 ++--
 src/include/utime.h     | 4 ++--
 src/make_version        | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/ebofs/csum.h b/src/ebofs/csum.h
index dbbf3989c72..d2e40b3d671 100644
--- a/src/ebofs/csum.h
+++ b/src/ebofs/csum.h
@@ -12,8 +12,8 @@
  * 
  */
 
-#ifndef __EBOFS_CSUM_H
-#define __EBOFS_CSUM_H
+#ifndef CEPH_EBOFS_CSUM_H
+#define CEPH_EBOFS_CSUM_H
 
 typedef uint64_t csum_t;
 
diff --git a/src/include/atomic.h b/src/include/atomic.h
index bb5e8cfc520..246b6bd53b0 100644
--- a/src/include/atomic.h
+++ b/src/include/atomic.h
@@ -12,8 +12,8 @@
  * 
  */
 
-#ifndef __CEPH_ATOMIC_H
-#define __CEPH_ATOMIC_H
+#ifndef CEPH_ATOMIC_H
+#define CEPH_ATOMIC_H
 
 #ifdef __CEPH__
 # include "acconfig.h"
diff --git a/src/include/ceph_frag.h b/src/include/ceph_frag.h
index 0f1ab9be740..5babb8e9535 100644
--- a/src/include/ceph_frag.h
+++ b/src/include/ceph_frag.h
@@ -1,5 +1,5 @@
-#ifndef CEPH_FRAG_H
-#define CEPH_FRAG_H
+#ifndef FS_CEPH_FRAG_H
+#define FS_CEPH_FRAG_H
 
 /*
  * "Frags" are a way to describe a subset of a 32-bit number space,
diff --git a/src/include/ceph_hash.h b/src/include/ceph_hash.h
index ca28a5a6513..d099c3f9023 100644
--- a/src/include/ceph_hash.h
+++ b/src/include/ceph_hash.h
@@ -1,5 +1,5 @@
-#ifndef CEPH_HASH_H
-#define CEPH_HASH_H
+#ifndef FS_CEPH_HASH_H
+#define FS_CEPH_HASH_H
 
 #define CEPH_STR_HASH_LINUX      0x1  /* linux dcache hash */
 #define CEPH_STR_HASH_RJENKINS   0x2  /* robert jenkins' */
diff --git a/src/include/inttypes.h b/src/include/inttypes.h
index 9862be963c4..50ebd4ee8e4 100644
--- a/src/include/inttypes.h
+++ b/src/include/inttypes.h
@@ -1,5 +1,5 @@
-#ifndef _CEPH_INTTYPES_H
-#define _CEPH_INTTYPES_H
+#ifndef CEPH_INTTYPES_H
+#define CEPH_INTTYPES_H
 
 #include <stdint.h>
 #include <linux/types.h>
diff --git a/src/include/rbd_types.h b/src/include/rbd_types.h
index cdcffedf3f3..4f6202afea8 100644
--- a/src/include/rbd_types.h
+++ b/src/include/rbd_types.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef _FS_CEPH_RBD
-#define _FS_CEPH_RBD
+#ifndef CEPH_RBD_TYPES_H
+#define CEPH_RBD_TYPES_H
 
 #include <linux/types.h>
 
diff --git a/src/include/types.h b/src/include/types.h
index 09b48ccfa38..00734438dd7 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -12,8 +12,8 @@
  * 
  */
 
-#ifndef __CEPH_TYPES_H
-#define __CEPH_TYPES_H
+#ifndef CEPH_TYPES_H
+#define CEPH_TYPES_H
 
 // this is needed for ceph_fs to compile in userland
 #include "inttypes.h"
diff --git a/src/include/utime.h b/src/include/utime.h
index 0185b3da169..f7510281676 100644
--- a/src/include/utime.h
+++ b/src/include/utime.h
@@ -12,8 +12,8 @@
  * 
  */
 
-#ifndef __UTIME_H
-#define __UTIME_H
+#ifndef CEPH_UTIME_H
+#define CEPH_UTIME_H
 
 #include <math.h>
 #include <sys/time.h>
diff --git a/src/make_version b/src/make_version
index eeee79ebbac..67f06194671 100755
--- a/src/make_version
+++ b/src/make_version
@@ -2,8 +2,8 @@
 
 
 print_all() {
-	echo "#ifndef __CEPH_VERSION_H"
-	echo "#define __CEPH_VERSION_H"
+	echo "#ifndef CEPH_VERSION_H"
+	echo "#define CEPH_VERSION_H"
 	echo
 	echo "#define CEPH_GIT_VER `git rev-parse HEAD 2>/dev/null`"
 	echo