From e12109287a9a5ee7023cac4a2d75cd8a18c59d88 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Jul 2010 08:38:17 -0700
Subject: [PATCH] --- yaml --- r: 208846 b: refs/heads/master c:
 5cd068c200795537fd78c423254389c8a07e2d20 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ceph/ceph_frag.h    | 4 ++--
 trunk/fs/ceph/ceph_fs.h      | 4 ++--
 trunk/fs/ceph/ceph_hash.h    | 4 ++--
 trunk/fs/ceph/crush/crush.h  | 4 ++--
 trunk/fs/ceph/crush/hash.h   | 4 ++--
 trunk/fs/ceph/crush/mapper.h | 4 ++--
 trunk/fs/ceph/msgr.h         | 4 ++--
 trunk/fs/ceph/rados.h        | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 967c309d10df..ceb5d24a5f48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9688f19a188e5ef6ac8a4b6a5b17273028d1090e
+refs/heads/master: 5cd068c200795537fd78c423254389c8a07e2d20
diff --git a/trunk/fs/ceph/ceph_frag.h b/trunk/fs/ceph/ceph_frag.h
index 793f50cb7c22..5babb8e95352 100644
--- a/trunk/fs/ceph/ceph_frag.h
+++ b/trunk/fs/ceph/ceph_frag.h
@@ -1,5 +1,5 @@
-#ifndef _FS_CEPH_FRAG_H
-#define _FS_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/trunk/fs/ceph/ceph_fs.h b/trunk/fs/ceph/ceph_fs.h
index 86fadeb9fd42..663ff9021111 100644
--- a/trunk/fs/ceph/ceph_fs.h
+++ b/trunk/fs/ceph/ceph_fs.h
@@ -9,8 +9,8 @@
  * LGPL2
  */
 
-#ifndef _FS_CEPH_CEPH_FS_H
-#define _FS_CEPH_CEPH_FS_H
+#ifndef CEPH_FS_H
+#define CEPH_FS_H
 
 #include "msgr.h"
 #include "rados.h"
diff --git a/trunk/fs/ceph/ceph_hash.h b/trunk/fs/ceph/ceph_hash.h
index 5ac470c433c9..d099c3f90236 100644
--- a/trunk/fs/ceph/ceph_hash.h
+++ b/trunk/fs/ceph/ceph_hash.h
@@ -1,5 +1,5 @@
-#ifndef _FS_CEPH_HASH_H
-#define _FS_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/trunk/fs/ceph/crush/crush.h b/trunk/fs/ceph/crush/crush.h
index dcd7e7523700..97e435b191f4 100644
--- a/trunk/fs/ceph/crush/crush.h
+++ b/trunk/fs/ceph/crush/crush.h
@@ -1,5 +1,5 @@
-#ifndef _CRUSH_CRUSH_H
-#define _CRUSH_CRUSH_H
+#ifndef CEPH_CRUSH_CRUSH_H
+#define CEPH_CRUSH_CRUSH_H
 
 #include <linux/types.h>
 
diff --git a/trunk/fs/ceph/crush/hash.h b/trunk/fs/ceph/crush/hash.h
index ff48e110e4bb..91e884230d5d 100644
--- a/trunk/fs/ceph/crush/hash.h
+++ b/trunk/fs/ceph/crush/hash.h
@@ -1,5 +1,5 @@
-#ifndef _CRUSH_HASH_H
-#define _CRUSH_HASH_H
+#ifndef CEPH_CRUSH_HASH_H
+#define CEPH_CRUSH_HASH_H
 
 #define CRUSH_HASH_RJENKINS1   0
 
diff --git a/trunk/fs/ceph/crush/mapper.h b/trunk/fs/ceph/crush/mapper.h
index 98e90046fd9f..c46b99c18bb0 100644
--- a/trunk/fs/ceph/crush/mapper.h
+++ b/trunk/fs/ceph/crush/mapper.h
@@ -1,5 +1,5 @@
-#ifndef _CRUSH_MAPPER_H
-#define _CRUSH_MAPPER_H
+#ifndef CEPH_CRUSH_MAPPER_H
+#define CEPH_CRUSH_MAPPER_H
 
 /*
  * CRUSH functions for find rules and then mapping an input to an
diff --git a/trunk/fs/ceph/msgr.h b/trunk/fs/ceph/msgr.h
index 892a0298dfdf..680d3d648cac 100644
--- a/trunk/fs/ceph/msgr.h
+++ b/trunk/fs/ceph/msgr.h
@@ -1,5 +1,5 @@
-#ifndef __MSGR_H
-#define __MSGR_H
+#ifndef CEPH_MSGR_H
+#define CEPH_MSGR_H
 
 /*
  * Data types for message passing layer used by Ceph.
diff --git a/trunk/fs/ceph/rados.h b/trunk/fs/ceph/rados.h
index 8fcc023056c7..20b5b45fa575 100644
--- a/trunk/fs/ceph/rados.h
+++ b/trunk/fs/ceph/rados.h
@@ -1,5 +1,5 @@
-#ifndef __RADOS_H
-#define __RADOS_H
+#ifndef CEPH_RADOS_H
+#define CEPH_RADOS_H
 
 /*
  * Data types for the Ceph distributed object storage layer RADOS