From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Jun 2016 14:27:16 +0000 (-0400)
Subject: osd/osd_types: add ceph_osd_alloc_hint_flag_string helper
X-Git-Tag: v11.0.0~160^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4079eb421e2a7d779d3457f4a443076a08ad40ea;p=ceph.git

osd/osd_types: add ceph_osd_alloc_hint_flag_string helper

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 173fe56dd033..662d78ab412f 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -109,7 +109,7 @@ const char * ceph_osd_op_flag_name(unsigned flag)
 string ceph_osd_op_flag_string(unsigned flags)
 {
   string s;
-  for (unsigned i=0; i<31; ++i) {
+  for (unsigned i=0; i<32; ++i) {
     if (flags & (1u<<i)) {
       if (s.length())
 	s += "+";
@@ -121,6 +121,21 @@ string ceph_osd_op_flag_string(unsigned flags)
   return string("-");
 }
 
+string ceph_osd_alloc_hint_flag_string(unsigned flags)
+{
+  string s;
+  for (unsigned i=0; i<32; ++i) {
+    if (flags & (1u<<i)) {
+      if (s.length())
+	s += "+";
+      s += ceph_osd_alloc_hint_flag_name(1u << i);
+    }
+  }
+  if (s.length())
+    return s;
+  return string("-");
+}
+
 void pg_shard_t::encode(bufferlist &bl) const
 {
   ENCODE_START(1, 1, bl);
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 553ee0600c0a..e112909a529b 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -84,6 +84,8 @@ const char *ceph_osd_op_flag_name(unsigned flag);
 string ceph_osd_flag_string(unsigned flags);
 /// conver CEPH_OSD_OP_FLAG_* op flags to a string
 string ceph_osd_op_flag_string(unsigned flags);
+/// conver CEPH_OSD_ALLOC_HINT_FLAG_* op flags to a string
+string ceph_osd_alloc_hint_flag_string(unsigned flags);
 
 struct pg_shard_t {
   int32_t osd;