summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-15 11:42:30 -0600
committerAlex Elder <elder@inktank.com>2013-02-18 12:20:13 -0600
commit4b568b1aaf23d0ce64b98d01d5ad1bcc7694440a (patch)
treeae843df0bdb5f5c4c008fc0dbee36c4608cde905
parent0315a7770983bbe69211efed1aaee08324acd54c (diff)
downloadlinux-4b568b1aaf23d0ce64b98d01d5ad1bcc7694440a.tar.gz
linux-4b568b1aaf23d0ce64b98d01d5ad1bcc7694440a.tar.bz2
linux-4b568b1aaf23d0ce64b98d01d5ad1bcc7694440a.zip
libceph: add ceph_osd_state_name()
Add the definition of ceph_osd_state_name(), to match its counterpart in user space. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--include/linux/ceph/rados.h2
-rw-r--r--net/ceph/ceph_strings.c15
2 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h
index 9c3b4aaf516b..b65182aba6f7 100644
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
@@ -150,6 +150,8 @@ struct ceph_eversion {
#define CEPH_OSD_AUTOOUT (1<<2) /* osd was automatically marked out */
#define CEPH_OSD_NEW (1<<3) /* osd is new, never marked in */
+extern const char *ceph_osd_state_name(int s);
+
/* osd weights. fixed point value: 0x10000 == 1.0 ("in"), 0 == "out" */
#define CEPH_OSD_IN 0x10000
#define CEPH_OSD_OUT 0
diff --git a/net/ceph/ceph_strings.c b/net/ceph/ceph_strings.c
index 3fbda04de29c..833075cff4e8 100644
--- a/net/ceph/ceph_strings.c
+++ b/net/ceph/ceph_strings.c
@@ -68,6 +68,21 @@ const char *ceph_osd_op_name(int op)
return "???";
}
+const char *ceph_osd_state_name(int s)
+{
+ switch (s) {
+ case CEPH_OSD_EXISTS:
+ return "exists";
+ case CEPH_OSD_UP:
+ return "up";
+ case CEPH_OSD_AUTOOUT:
+ return "autoout";
+ case CEPH_OSD_NEW:
+ return "new";
+ default:
+ return "???";
+ }
+}
const char *ceph_pool_op_name(int op)
{