ceph: fix straggler header ifdef guards

diff --git a/src/ebofs/csum.h b/src/ebofs/csum.h
index dbbf3989c72ac1eafbd066c1ed73ba0d4b0fb4bd..d2e40b3d6718f18bc37dacbdc829f851e974640d 100644 (file)
--- 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 bb5e8cfc520a3f227417d60f8abb38c03a914a6d..246b6bd53b04fc70fe93ca115b4f677a171dfe53 100644 (file)
--- 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 0f1ab9be740b5c999503e7b5017a13196dea0e21..5babb8e95352a6a7468feca70a343fafb56bddad 100644 (file)
--- 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 ca28a5a6513d518be20f973823d3257aa9a09a41..d099c3f90236276976586dfbf505ff46141e7ddb 100644 (file)
--- 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 9862be963c48ac77c0af970e6bf021b80eefd2f1..50ebd4ee8e48d97be29037fdac83b761930f7038 100644 (file)
--- 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 cdcffedf3f3ebdf12ffb44343f6d032907a98c7c..4f6202afea851d5c30ff78800ce81e8350c7c307 100644 (file)
--- 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 09b48ccfa383919ea3bacbcb27beb81145af6415..00734438dd7ca883efec8569eeee9f39e598b767 100644 (file)
--- 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 0185b3da16991393f47674e5c841a7edb1cb7951..f7510281676d9bbc56e1958e97a49f3f50834557 100644 (file)
--- 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 eeee79ebbac0965bcc835939297a65e0c4d7529d..67f06194671f12b397d1f598783b0d302450e177 100755 (executable)
--- 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