From: Sage Weil <sage@redhat.com>
Date: Wed, 8 Feb 2017 22:03:26 +0000 (-0500)
Subject: osd/PrimaryLogPG: unconditionally set PGNLS next to hobject
X-Git-Tag: v12.0.1~427^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=784c7edb4e961d17d15759d9e7094fe929890a47;p=ceph.git

osd/PrimaryLogPG: unconditionally set PGNLS next to hobject

Drop nibblewise workaround.

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index be16d53da926..977a0dbca8d3 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1235,15 +1235,9 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op)
 	    ls_iter == sentries.end()) {
 	  result = 1;
 
-	  if (get_osdmap()->test_flag(CEPH_OSDMAP_SORTBITWISE)) {
-	    // Set response.handle to the start of the next PG
-	    // according to the object sort order.  Only do this if
-	    // the cluster is in bitwise mode; with legacy nibblewise
-	    // sort PGs don't always cover contiguous ranges of the
-	    // hash order.
-	    response.handle = info.pgid.pgid.get_hobj_end(
-	      pool.info.get_pg_num());
-	  }
+	  // Set response.handle to the start of the next PG according
+	  // to the object sort order.
+	  response.handle = info.pgid.pgid.get_hobj_end(pool.info.get_pg_num());
 	} else {
           response.handle = next;
         }