From: Sage Weil <sage@redhat.com>
Date: Mon, 13 Jul 2015 14:51:53 +0000 (-0400)
Subject: os/MemStore: only support bitwise sort order
X-Git-Tag: v9.1.0~346^2~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=744508ffc85f6406a473097254490f3cb94d8272;p=ceph.git

os/MemStore: only support bitwise sort order

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

diff --git a/src/os/MemStore.cc b/src/os/MemStore.cc
index 6d60816016c..be6fc77630c 100644
--- a/src/os/MemStore.cc
+++ b/src/os/MemStore.cc
@@ -422,9 +422,11 @@ bool MemStore::collection_empty(coll_t cid)
 }
 
 int MemStore::collection_list(coll_t cid, ghobject_t start, ghobject_t end,
-			      int max,
+			      bool sort_bitwise, int max,
 			      vector<ghobject_t> *ls, ghobject_t *next)
 {
+  if (!sort_bitwise)
+    return -EOPNOTSUPP;
   CollectionRef c = get_collection(cid);
   if (!c)
     return -ENOENT;
diff --git a/src/os/MemStore.h b/src/os/MemStore.h
index 5233a156449..6852bc11edc 100644
--- a/src/os/MemStore.h
+++ b/src/os/MemStore.h
@@ -307,7 +307,7 @@ public:
   bool collection_exists(coll_t c);
   bool collection_empty(coll_t c);
   int collection_list(coll_t cid, ghobject_t start, ghobject_t end,
-		      int max,
+		      bool sort_bitwise, int max,
 		      vector<ghobject_t> *ls, ghobject_t *next);
 
   int omap_get(