Merge remote-tracking branch 'origin/wip-10270' into master

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
	src/librados/IoCtxImpl.cc
	src/librados/IoCtxImpl.h

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/include/rados/librados.hpp
Simple merge

diff --cc src/librados/IoCtxImpl.cc
index 2af3d6f499cf5013af7d64658d5e051dc8d4cf6e,c9ec7223d4d976140446936686eea0972d03033d..6764d72300ab0aec1cc827ba94328cc3926ace38
--- 1/src/librados/IoCtxImpl.cc
--- 2/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@@ -33,14 -33,13 +33,14 @@@ librados::IoCtxImpl::IoCtxImpl() 
  }
  
  librados::IoCtxImpl::IoCtxImpl(RadosClient *c, Objecter *objecter,
-                              int poolid,
 -                             Mutex *client_lock, int64_t poolid,
++                             int64_t poolid,
                               const char *pool_name, snapid_t s)
    : ref_cnt(0), client(c), poolid(poolid), pool_name(pool_name), snap_seq(s),
 -    assert_ver(0), notify_timeout(c->cct->_conf->client_notify_timeout),
 +    assert_ver(0), last_objver(0),
 +    notify_timeout(c->cct->_conf->client_notify_timeout),
      oloc(poolid),
      aio_write_list_lock("librados::IoCtxImpl::aio_write_list_lock"),
 -    aio_write_seq(0), lock(client_lock), objecter(objecter)
 +    aio_write_seq(0), objecter(objecter)
  {
  }
  

diff --cc src/librados/IoCtxImpl.h
index 4235f13a4af8dec69daef86567adee36b3f0936b,3147ae5dc0d8336aeaf27e947ee44f0812757f78..ab73cfa390fffde505cdf49a89495b9311bba3df
--- 1/src/librados/IoCtxImpl.h
--- 2/src/librados/IoCtxImpl.h
+++ b/src/librados/IoCtxImpl.h
@@@ -50,8 -50,9 +50,8 @@@ struct librados::IoCtxImpl 
    Objecter *objecter;
  
    IoCtxImpl();
 -  IoCtxImpl(RadosClient *c, Objecter *objecter, Mutex *client_lock,
 +  IoCtxImpl(RadosClient *c, Objecter *objecter,
-           int poolid, const char *pool_name, snapid_t s);
+           int64_t poolid, const char *pool_name, snapid_t s);
  
    void dup(const IoCtxImpl& rhs) {
      // Copy everything except the ref count

diff --cc src/librados/RadosClient.cc
index 10aad97eee18b2b14a5e44ffb22c10071929fac1,e0e78464f7fc859be87f916a5af08e27844dfcf0..ad018325ed9327066a57b5d559f7f125b1dd721d
--- 1/src/librados/RadosClient.cc
--- 2/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@@ -352,6 -344,19 +352,19 @@@ int librados::RadosClient::create_ioctx
    return 0;
  }
  
 -  *io = new librados::IoCtxImpl(this, objecter, &lock, pool_id, pool_name.c_str(),
+ int librados::RadosClient::create_ioctx(int64_t pool_id, IoCtxImpl **io)
+ {
+   std::string pool_name;
+   int r = pool_get_name(pool_id, &pool_name);
+   if (r < 0) {
+     return r;
+   }
+ 
++  *io = new librados::IoCtxImpl(this, objecter, pool_id, pool_name.c_str(),
+                                 CEPH_NOSNAP);
+   return 0;
+ }
+ 
  bool librados::RadosClient::ms_dispatch(Message *m)
  {
    bool ret;

diff --cc src/librados/RadosClient.h
Simple merge

diff --cc src/librados/librados.cc
Simple merge

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/tracing/librados.tp
Simple merge