From: Sage Weil <sage@inktank.com>
Date: Thu, 15 Aug 2013 22:18:51 +0000 (-0700)
Subject: librbd: remove mostly-useless assign_bid helper
X-Git-Tag: v0.68~64^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93ac92d85be5445ca75173e1685378475135d1e5;p=ceph.git

librbd: remove mostly-useless assign_bid helper

Do it inline.

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

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 1fd7942f3b8e..9c9ae16dfa4e 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -228,12 +228,6 @@ namespace librbd {
     return 0;
   }
 
-  uint64_t rbd_assign_bid(IoCtx& io_ctx)
-  {
-    Rados rados(io_ctx);
-    return rados.get_instance_id();
-  }
-
   int read_header_bl(IoCtx& io_ctx, const string& header_oid,
 		     bufferlist& header, uint64_t *ver)
   {
@@ -872,7 +866,8 @@ reprotect_and_return_err:
       return -EDOM;
     }
 
-    uint64_t bid = rbd_assign_bid(io_ctx);
+    Rados rados(io_ctx);
+    uint64_t bid = rados.get_instance_id();
 
     // if striping is enabled, use possibly custom defaults
     if (!old_format && (features & RBD_FEATURE_STRIPINGV2) &&
diff --git a/src/librbd/internal.h b/src/librbd/internal.h
index 048e4387c412..33f5191706d7 100644
--- a/src/librbd/internal.h
+++ b/src/librbd/internal.h
@@ -145,7 +145,6 @@ namespace librbd {
   int read_rbd_info(librados::IoCtx& io_ctx, const std::string& info_oid,
 		    struct rbd_info *info);
 
-  uint64_t rbd_assign_bid(librados::IoCtx& io_ctx);
   int read_header_bl(librados::IoCtx& io_ctx, const std::string& md_oid,
 		     ceph::bufferlist& header, uint64_t *ver);
   int notify_change(librados::IoCtx& io_ctx, const std::string& oid,