From 3b1bf4bddaa4b2759b4c0b34cee97a146439b0e1 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 5 Mar 2010 16:47:26 -0800 Subject: [PATCH] auth: move CEPH_AUTH_UID_DEFAULT into ceph_fs.h --- src/auth/Auth.h | 2 -- src/include/ceph_fs.h | 2 ++ src/osd/OSDCaps.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/auth/Auth.h b/src/auth/Auth.h index 894ac929f138e..638ed350a6172 100644 --- a/src/auth/Auth.h +++ b/src/auth/Auth.h @@ -22,8 +22,6 @@ #include -#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 0f46195934c34..0ae4745b24b60 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 d4ffcfd652fee..25b226c5b4606 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) { -- 2.39.5