import quincy beta 17.1.0

[ceph.git] / ceph / src / libcephfs.cc

diff --git a/ceph/src/libcephfs.cc b/ceph/src/libcephfs.cc
index d6e3208b1cb8b6a470c0240812ef5793f36b8643..424cbb85a10e61ef2550a6da9458fbcef247abab 100644 (file)
--- a/ceph/src/libcephfs.cc
+++ b/ceph/src/libcephfs.cc
@@ -37,6 +37,8 @@
 
 #define DEFAULT_UMASK 002
 
+using namespace std;
+
 static mode_t umask_cb(void *);
 namespace {
 // Set things up this way so we don't start up threads until mount and
@@ -273,10 +275,8 @@ public:
 
   int conf_parse_argv(int argc, const char **argv)
   {
-    int ret;
-    vector<const char*> args;
-    argv_to_vec(argc, argv, args);
-    ret = cct->_conf.parse_argv(args);
+    auto args = argv_to_vec(argc, argv);
+    int ret = cct->_conf.parse_argv(args);
     if (ret)
        return ret;
     cct->_conf.apply_changes(nullptr);
@@ -2164,11 +2164,17 @@ extern "C" void ceph_finish_reclaim(class ceph_mount_info *cmount)
   cmount->get_client()->finish_reclaim();
 }
 
+// This is deprecated, use ceph_ll_register_callbacks2 instead.
 extern "C" void ceph_ll_register_callbacks(class ceph_mount_info *cmount,
                                           struct ceph_client_callback_args *args)
 {
   cmount->get_client()->ll_register_callbacks(args);
+}
 
+extern "C" int ceph_ll_register_callbacks2(class ceph_mount_info *cmount,
+                                           struct ceph_client_callback_args *args)
+{
+  return cmount->get_client()->ll_register_callbacks2(args);
 }