From d4f98e94c9dc499346a015b0e3dfa3ae0eb0e7b2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Mar 2009 11:51:07 -0800 Subject: [PATCH] kclient: fix __read_mostly attributes --- src/kernel/addr.c | 2 +- src/kernel/caps.c | 2 +- src/kernel/ceph_tools.c | 2 +- src/kernel/dir.c | 2 +- src/kernel/export.c | 2 +- src/kernel/file.c | 2 +- src/kernel/inode.c | 2 +- src/kernel/ioctl.c | 2 +- src/kernel/mds_client.c | 2 +- src/kernel/mdsmap.c | 2 +- src/kernel/mon_client.c | 2 +- src/kernel/osd_client.c | 2 +- src/kernel/osdmap.c | 2 +- src/kernel/snap.c | 2 +- src/kernel/super.c | 6 +++--- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/kernel/addr.c b/src/kernel/addr.c index ef42da97fe1b9..f6e4119e53808 100644 --- a/src/kernel/addr.c +++ b/src/kernel/addr.c @@ -8,7 +8,7 @@ #include #include "ceph_debug.h" -int ceph_debug_addr = -1 __read_mostly; +int ceph_debug_addr __read_mostly = -1; #define DOUT_MASK DOUT_MASK_ADDR #define DOUT_VAR ceph_debug_addr #include "super.h" diff --git a/src/kernel/caps.c b/src/kernel/caps.c index 1abec49558345..395f06537f8b3 100644 --- a/src/kernel/caps.c +++ b/src/kernel/caps.c @@ -5,7 +5,7 @@ #include "ceph_debug.h" -int ceph_debug_caps = -1 __read_mostly; +int ceph_debug_caps __read_mostly = -1; #define DOUT_MASK DOUT_MASK_CAPS #define DOUT_VAR ceph_debug_caps #include "super.h" diff --git a/src/kernel/ceph_tools.c b/src/kernel/ceph_tools.c index 5be096b6c04f0..20fc83abe7c5d 100644 --- a/src/kernel/ceph_tools.c +++ b/src/kernel/ceph_tools.c @@ -8,7 +8,7 @@ #include "ceph_debug.h" -int ceph_debug_tools = -1 __read_mostly; +int ceph_debug_tools __read_mostly = -1; #define DOUT_VAR ceph_debug_tools #define DOUT_MASK DOUT_MASK_TOOLS #include "super.h" diff --git a/src/kernel/dir.c b/src/kernel/dir.c index 004040eb3b5bf..4c8a52304c2ba 100644 --- a/src/kernel/dir.c +++ b/src/kernel/dir.c @@ -3,7 +3,7 @@ #include "ceph_debug.h" -int ceph_debug_dir = -1 __read_mostly; +int ceph_debug_dir __read_mostly = -1; #define DOUT_MASK DOUT_MASK_DIR #define DOUT_VAR ceph_debug_dir #include "super.h" diff --git a/src/kernel/export.c b/src/kernel/export.c index 8749565aec8a4..6c5b484768d94 100644 --- a/src/kernel/export.c +++ b/src/kernel/export.c @@ -3,7 +3,7 @@ #include "super.h" #include "ceph_debug.h" -int ceph_debug_export = -1 __read_mostly; +int ceph_debug_export __read_mostly = -1; #define DOUT_MASK DOUT_MASK_EXPORT #define DOUT_VAR ceph_debug_export diff --git a/src/kernel/file.c b/src/kernel/file.c index 4ac7332639833..9fa37592f2278 100644 --- a/src/kernel/file.c +++ b/src/kernel/file.c @@ -5,7 +5,7 @@ #include "ceph_debug.h" -int ceph_debug_file = -1 __read_mostly; +int ceph_debug_file __read_mostly = -1; #define DOUT_MASK DOUT_MASK_FILE #define DOUT_VAR ceph_debug_file #include "super.h" diff --git a/src/kernel/inode.c b/src/kernel/inode.c index 0462875533af3..3e5c08e2ea1bb 100644 --- a/src/kernel/inode.c +++ b/src/kernel/inode.c @@ -10,7 +10,7 @@ #include "ceph_debug.h" -int ceph_debug_inode = -1 __read_mostly; +int ceph_debug_inode __read_mostly = -1; #define DOUT_MASK DOUT_MASK_INODE #define DOUT_VAR ceph_debug_inode #include "super.h" diff --git a/src/kernel/ioctl.c b/src/kernel/ioctl.c index e032ac485ac4d..55c992e49f058 100644 --- a/src/kernel/ioctl.c +++ b/src/kernel/ioctl.c @@ -2,7 +2,7 @@ #include "super.h" #include "ceph_debug.h" -int ceph_debug_ioctl = -1 __read_mostly; +int ceph_debug_ioctl __read_mostly = -1; #define DOUT_MASK DOUT_MASK_IOCTL #define DOUT_VAR ceph_debug_ioctl diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c index bedc423f9980b..050d72ada42b9 100644 --- a/src/kernel/mds_client.c +++ b/src/kernel/mds_client.c @@ -6,7 +6,7 @@ #include "ceph_debug.h" -int ceph_debug_mdsc = -1 __read_mostly; +int ceph_debug_mdsc __read_mostly = -1; #define DOUT_VAR ceph_debug_mdsc #define DOUT_MASK DOUT_MASK_MDSC #include "super.h" diff --git a/src/kernel/mdsmap.c b/src/kernel/mdsmap.c index 531ef1f7a2f85..87d38702203f6 100644 --- a/src/kernel/mdsmap.c +++ b/src/kernel/mdsmap.c @@ -10,7 +10,7 @@ #include "ceph_debug.h" -int ceph_debug_mdsmap = -1 __read_mostly; +int ceph_debug_mdsmap __read_mostly = -1; #define DOUT_MASK DOUT_MASK_MDSMAP #define DOUT_VAR ceph_debug_mdsmap #include "super.h" diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c index 96d9fe1a2ced8..085e8ecdc040d 100644 --- a/src/kernel/mon_client.c +++ b/src/kernel/mon_client.c @@ -6,7 +6,7 @@ #include "ceph_debug.h" -int ceph_debug_mon = -1 __read_mostly; +int ceph_debug_mon __read_mostly = -1; #define DOUT_MASK DOUT_MASK_MON #define DOUT_VAR ceph_debug_mon #include "super.h" diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c index 4dedcac6dbaea..ce3a936e56eca 100644 --- a/src/kernel/osd_client.c +++ b/src/kernel/osd_client.c @@ -7,7 +7,7 @@ #include "ceph_debug.h" -int ceph_debug_osdc = -1 __read_mostly; +int ceph_debug_osdc __read_mostly = -1; #define DOUT_MASK DOUT_MASK_OSDC #define DOUT_VAR ceph_debug_osdc #include "super.h" diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c index 840254d958cd1..a783f7f75041c 100644 --- a/src/kernel/osdmap.c +++ b/src/kernel/osdmap.c @@ -8,7 +8,7 @@ #include "ceph_debug.h" -int ceph_debug_osdmap = -1 __read_mostly; +int ceph_debug_osdmap __read_mostly = -1; #define DOUT_MASK DOUT_MASK_OSDMAP #define DOUT_VAR ceph_debug_osdmap diff --git a/src/kernel/snap.c b/src/kernel/snap.c index c3b167e8b62c4..98f6df6dc98c2 100644 --- a/src/kernel/snap.c +++ b/src/kernel/snap.c @@ -4,7 +4,7 @@ #include "ceph_debug.h" -int ceph_debug_snap = -1 __read_mostly; +int ceph_debug_snap __read_mostly = -1; #define DOUT_MASK DOUT_MASK_SNAP #define DOUT_VAR ceph_debug_snap diff --git a/src/kernel/super.c b/src/kernel/super.c index 091c6f7068fa1..67396c1d03886 100644 --- a/src/kernel/super.c +++ b/src/kernel/super.c @@ -22,11 +22,11 @@ * if the per-file debug level >= 0, then that overrides this global * debug level. */ -int ceph_debug = 1 __read_mostly; -int ceph_debug_mask = 0xffffffff __read_mostly; +int ceph_debug __read_mostly = 1; +int ceph_debug_mask __read_mostly = 0xffffffff; /* if true, send output to KERN_INFO (console) instead of KERN_DEBUG. */ int ceph_debug_console __read_mostly; -int ceph_debug_super = -1 __read_mostly; /* for this file */ +int ceph_debug_super __read_mostly = -1; /* for this file */ #define DOUT_MASK DOUT_MASK_SUPER #define DOUT_VAR ceph_debug_super -- 2.39.5