---

yaml --- r: 359663 b: refs/heads/master c: 4b568b1 h: refs/heads/master i: 359661: 0bc7983 359659: af06c23 359655: 5d4d0ae 359647: 3ddf936 v: v3
git-mirror · Feb 18, 2013 · c1ace9b · c1ace9b
1 parent 570555c
commit c1ace9b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0315a7770983bbe69211efed1aaee08324acd54c
+refs/heads/master: 4b568b1aaf23d0ce64b98d01d5ad1bcc7694440a
diff --git a/trunk/include/linux/ceph/rados.h b/trunk/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/trunk/net/ceph/ceph_strings.c b/trunk/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)
 {