const-ify some unchanging static structs

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/client/fuse.cc b/src/client/fuse.cc
index c5c4df9c280a8db713a43af0ccf95fb25e2a3563..81ddfd681f9e9b6fc122c84f46220e480fbfaf65 100644 (file)
--- a/src/client/fuse.cc
+++ b/src/client/fuse.cc
@@ -224,7 +224,7 @@ static int ceph_releasedir(const char *path, struct fuse_file_info *fi)
 
 
 
-static struct fuse_operations ceph_oper = {
+const static struct fuse_operations ceph_oper = {
   getattr: ceph_getattr,
   readlink: ceph_readlink,
   getdir: 0,

diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index 0ffa32503d03277d33e5ae018a872b80b370aceb..bab81828ba8dfbc53a5aef0f44cd4d59d1528102 100644 (file)
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -51,7 +51,7 @@ extern "C" {
 
 struct LockType {
   int type;
-  sm_t *sm;
+  const sm_t *sm;
 
   LockType(int t) : type(t) {
     switch (type) {

diff --git a/src/mds/locks.c b/src/mds/locks.c
index 75a52b359b5e3ec667e7ec60faa7b64149fb3316..8225eef572cbba2a35541deab21958ae9a91f76b 100644 (file)
--- a/src/mds/locks.c
+++ b/src/mds/locks.c
@@ -12,7 +12,7 @@ typedef char bool;
 #include "include/ceph_fs.h"
 #include "locks.h"
 
-struct sm_state_t simplelock[LOCK_MAX] = {
+static const struct sm_state_t simplelock[LOCK_MAX] = {
                       // stable     loner  rep state  r     rp   rd   wr   fwr  l    x    caps,other
     [LOCK_SYNC]      = { 0,         false, LOCK_SYNC, ANY,  0,   ANY, 0,   0,   ANY, 0,   CEPH_CAP_GSHARED,0,0,CEPH_CAP_GSHARED },
     [LOCK_LOCK_SYNC] = { LOCK_SYNC, false, LOCK_LOCK, ANY,  XCL, XCL, 0,   0,   XCL, 0,   0,0,0,0 },
@@ -36,7 +36,7 @@ struct sm_state_t simplelock[LOCK_MAX] = {
 
 };
 
-struct sm_t sm_simplelock = {
+const struct sm_t sm_simplelock = {
        .states = simplelock,
        .allowed_ever_auth = CEPH_CAP_GSHARED | CEPH_CAP_GEXCL,
        .allowed_ever_replica = CEPH_CAP_GSHARED,
@@ -50,7 +50,7 @@ struct sm_t sm_simplelock = {
 //  Tempsync _/
 // (out of date)
 
-struct sm_state_t scatterlock[LOCK_MAX] = {
+static const struct sm_state_t scatterlock[LOCK_MAX] = {
                       // stable     loner  rep state  r     rp   rd   wr   fwr  l    x    caps,other
     [LOCK_SYNC]      = { 0,         false, LOCK_SYNC, ANY,  0,   ANY, 0,   0,   ANY, 0,   CEPH_CAP_GSHARED,0,0,CEPH_CAP_GSHARED },
     [LOCK_LOCK_SYNC] = { LOCK_SYNC, false, LOCK_LOCK, AUTH, 0,   0,   0,   0,   0,   0,   0,0,0,0 },
@@ -72,7 +72,7 @@ struct sm_state_t scatterlock[LOCK_MAX] = {
     [LOCK_SYNC_MIX2] = { LOCK_MIX,  false, 0,         0,    0,   0,   0,   0,   0,   0,   0,0,0,0 },
 };
 
-struct sm_t sm_scatterlock = {
+const struct sm_t sm_scatterlock = {
        .states = scatterlock,
        .allowed_ever_auth = CEPH_CAP_GSHARED | CEPH_CAP_GEXCL,
        .allowed_ever_replica = CEPH_CAP_GSHARED,
@@ -80,7 +80,7 @@ struct sm_t sm_scatterlock = {
        .can_remote_xlock = 0,
 };
 
-struct sm_state_t filelock[LOCK_MAX] = {
+const struct sm_state_t filelock[LOCK_MAX] = {
                       // stable     loner  rep state  r     rp   rd   wr   fwr  l    x    caps(any,loner,xlocker,replica)
     [LOCK_SYNC]      = { 0,         false, LOCK_SYNC, ANY,  0,   ANY, 0,   0,   ANY, 0,   CEPH_CAP_GSHARED|CEPH_CAP_GCACHE|CEPH_CAP_GRD,0,0,CEPH_CAP_GSHARED|CEPH_CAP_GCACHE|CEPH_CAP_GRD },
     [LOCK_LOCK_SYNC] = { LOCK_SYNC, false, LOCK_LOCK, AUTH, 0,   0,   0,   0,   0,   0,   CEPH_CAP_GCACHE,0,0,0 },
@@ -115,7 +115,7 @@ struct sm_state_t filelock[LOCK_MAX] = {
     [LOCK_SCAN_LOCK] = { LOCK_LOCK, false, LOCK_LOCK, 0,    0,   0,   0,   0,   0,   0,   0,0,0,0 },
 };
 
-struct sm_t sm_filelock = {
+const struct sm_t sm_filelock = {
        .states = filelock,
        .allowed_ever_auth = (CEPH_CAP_GSHARED |
                              CEPH_CAP_GEXCL |
@@ -137,12 +137,12 @@ struct sm_t sm_filelock = {
 };
 
 
-struct sm_state_t locallock[LOCK_MAX] = {
+const struct sm_state_t locallock[LOCK_MAX] = {
                       // stable     loner  rep state  r     rp   rd   wr   fwr  l    x    caps(any,loner,xlocker,replica)
     [LOCK_LOCK]      = { 0,         false, LOCK_LOCK, ANY,  0,   ANY, 0,   0,   ANY, AUTH,0,0,0,0 },
 };
 
-struct sm_t sm_locallock = {
+const struct sm_t sm_locallock = {
   .states = locallock,
   .allowed_ever_auth = 0,
   .allowed_ever_replica = 0,

diff --git a/src/mds/locks.h b/src/mds/locks.h
index db55104b95d03727d459ba54d53af78826ba57ba..a5d1b37b7eab459d5fdbbf8484c07d210079aac8 100644 (file)
--- a/src/mds/locks.h
+++ b/src/mds/locks.h
@@ -20,7 +20,7 @@ struct sm_state_t {
 };
 
 struct sm_t {
-  struct sm_state_t *states;
+  const struct sm_state_t *states;
   int allowed_ever_auth;
   int allowed_ever_replica;
   int careful;
@@ -33,10 +33,10 @@ struct sm_t {
 //#define FW   4 // fw to auth, if replica
 #define REQ  5 // req state change from auth, if replica
 
-extern struct sm_t sm_simplelock;
-extern struct sm_t sm_filelock;
-extern struct sm_t sm_scatterlock;
-extern struct sm_t sm_locallock;
+extern const struct sm_t sm_simplelock;
+extern const struct sm_t sm_filelock;
+extern const struct sm_t sm_scatterlock;
+extern const struct sm_t sm_locallock;
 
 
 

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 2cb283d59eac516e85109633b4182d454cd2434f..b923c42c8ced7e21810af56686cc1f39e7d93702 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -19,7 +19,7 @@ struct errno_http {
   const char *default_code;
 };
 
-static struct errno_http hterrs[] = {
+const static struct errno_http hterrs[] = {
     { 0, "200", "" },
     { 204, "204", "NoContent" },
     { 206, "206", "" },