From: Greg Farnum <gregf@hq.newdream.net>
Date: Sat, 6 Mar 2010 00:47:26 +0000 (-0800)
Subject: auth: move CEPH_AUTH_UID_DEFAULT into ceph_fs.h
X-Git-Tag: v0.20~326
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b1bf4bddaa4b2759b4c0b34cee97a146439b0e1;p=ceph.git

auth: move CEPH_AUTH_UID_DEFAULT into ceph_fs.h
---

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 894ac929f138..638ed350a617 100644
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -22,8 +22,6 @@
 
 #include <errno.h>
 
-#define CEPH_AUTH_UID_DEFAULT (__u64) -1
-
 class Cond;
 
 struct EntityName {
diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 0f46195934c3..0ae4745b24b6 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -99,6 +99,8 @@ int ceph_file_layout_is_valid(const struct ceph_file_layout *layout);
 #define CEPH_AUTH_NONE	 	0x1
 #define CEPH_AUTH_CEPHX	 	0x2
 
+#define CEPH_AUTH_UID_DEFAULT (__u64) -1
+
 
 /*********************************************
  * message layer
diff --git a/src/osd/OSDCaps.h b/src/osd/OSDCaps.h
index d4ffcfd652fe..25b226c5b460 100644
--- a/src/osd/OSDCaps.h
+++ b/src/osd/OSDCaps.h
@@ -23,9 +23,6 @@
 
 #define OSD_POOL_CAP_ALL (OSD_POOL_CAP_R | OSD_POOL_CAP_W | OSD_POOL_CAP_X)
 
-//this needs to match Auth.h
-#define CEPH_AUTH_UID_DEFAULT (__u64) -1
-
 typedef __u8 rwx_t;
 
 static inline ostream& operator<<(ostream& out, rwx_t p) {