From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Jun 2012 20:42:36 +0000 (-0700)
Subject: osdcap: use static const instead of #define
X-Git-Tag: v0.49~83^2~31^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cfd65b1282a88e022946941791407d4442cc541;p=ceph.git

osdcap: use static const instead of #define

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSDCap.h b/src/osd/OSDCap.h
index 4bb53fc8fcba..8a81be39e37c 100644
--- a/src/osd/OSDCap.h
+++ b/src/osd/OSDCap.h
@@ -30,12 +30,10 @@ using std::ostream;
 
 #include "include/types.h"
 
-
-#define OSD_CAP_R 0x01
-#define OSD_CAP_W 0x02
-#define OSD_CAP_X 0x04
-#define OSD_CAP_ANY 0xff
-#define OSD_CAP_ALL (OSD_CAP_R | OSD_CAP_W | OSD_CAP_X)
+static const __u8 OSD_CAP_R = 0x01;      // read
+static const __u8 OSD_CAP_W = 0x02;      // write
+static const __u8 OSD_CAP_X = 0x04;      // (class) execute
+static const __u8 OSD_CAP_ANY = 0xff;    // *
 
 typedef __u8 rwxa_t;