From: Sage Weil <sage@redhat.com>
Date: Fri, 23 Feb 2018 14:58:48 +0000 (-0600)
Subject: osd/osd_types: pg_t: remove set_preferred()
X-Git-Tag: v13.0.2~185^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b527616de44d337a9449c8c83884b9f805d243b;p=ceph.git

osd/osd_types: pg_t: remove set_preferred()

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 5ca378d1677..bf071ba455b 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -437,7 +437,6 @@ bool pg_t::parse(const char *s)
 
 bool spg_t::parse(const char *s)
 {
-  pgid.set_preferred(-1);
   shard = shard_id_t::NO_SHARD;
   uint64_t ppool;
   uint32_t pseed;
@@ -451,12 +450,8 @@ bool spg_t::parse(const char *s)
 
   const char *p = strchr(s, 'p');
   if (p) {
-    r = sscanf(p, "p%d", &pref);
-    if (r == 1) {
-      pgid.set_preferred(pref);
-    } else {
-      return false;
-    }
+    // preferred PGs were removed years ago
+    return false;
   }
 
   p = strchr(s, 's');
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 8c240c86a87..f8156fe6eaf 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -407,9 +407,6 @@ struct pg_t {
   void set_pool(uint64_t p) {
     m_pool = p;
   }
-  void set_preferred(int32_t osd) {
-    m_preferred = osd;
-  }
 
   pg_t get_parent() const;
   pg_t get_ancestor(unsigned old_pg_num) const;