From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Jun 2016 14:26:45 +0000 (-0400)
Subject: os/bluestore: _setallochint -> _set_alloc_hint
X-Git-Tag: v11.0.0~160^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ab1b903253e87098c38aae852fdbb58c736736c;p=ceph.git

os/bluestore: _setallochint -> _set_alloc_hint

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 3ba871393901..3b26c6c818fa 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5303,10 +5303,10 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t)
 
     case Transaction::OP_SETALLOCHINT:
       {
-	r = _setallochint(txc, c, o,
-			  op->expected_object_size,
-			  op->expected_write_size,
-			  op->alloc_hint_flags);
+	r = _set_alloc_hint(txc, c, o,
+			    op->expected_object_size,
+			    op->expected_write_size,
+			    op->alloc_hint_flags);
       }
       break;
 
@@ -6516,12 +6516,13 @@ int BlueStore::_omap_rmkey_range(TransContext *txc,
   return r;
 }
 
-int BlueStore::_setallochint(TransContext *txc,
-			     CollectionRef& c,
-			     OnodeRef& o,
-			     uint64_t expected_object_size,
-			     uint64_t expected_write_size,
-			     uint32_t flags)
+int BlueStore::_set_alloc_hint(
+  TransContext *txc,
+  CollectionRef& c,
+  OnodeRef& o,
+  uint64_t expected_object_size,
+  uint64_t expected_write_size,
+  uint32_t flags)
 {
   dout(15) << __func__ << " " << c->cid << " " << o->oid
 	   << " object_size " << expected_object_size
diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 39cf17bb6010..c352209c1d19 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -1392,12 +1392,13 @@ private:
 			CollectionRef& c,
 			OnodeRef& o,
 			const string& first, const string& last);
-  int _setallochint(TransContext *txc,
-		    CollectionRef& c,
-		    OnodeRef& o,
-		    uint64_t expected_object_size,
-		    uint64_t expected_write_size,
-		    uint32_t flags);
+  int _set_alloc_hint(
+    TransContext *txc,
+    CollectionRef& c,
+    OnodeRef& o,
+    uint64_t expected_object_size,
+    uint64_t expected_write_size,
+    uint32_t flags);
   int _clone(TransContext *txc,
 	     CollectionRef& c,
 	     OnodeRef& oldo,