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 1fd7942f3b8e95de8875a67f688cafab0dd54384..9c9ae16dfa4ee8b21560d07e60d11e51f5103364 100644 (file)
--- 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 048e4387c4121ee076a9ee01b6b0cd45a8ad31bd..33f5191706d73d257fa9c8278331b26ffda9d5b0 100644 (file)
--- 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,