update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / os / FuseStore.cc

diff --git a/ceph/src/os/FuseStore.cc b/ceph/src/os/FuseStore.cc
index 54200f1d006f3009d770b5227fedd63b6c41f537..e06131ce33ce57b2d6fc91985dc0778748b8d3f8 100644 (file)
--- a/ceph/src/os/FuseStore.cc
+++ b/ceph/src/os/FuseStore.cc
@@ -27,6 +27,15 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "fuse "
 
+using std::list;
+using std::map;
+using std::set;
+using std::string;
+using std::vector;
+
+using ceph::bufferlist;
+using ceph::bufferptr;
+
 // some fuse-y bits of state
 struct fs_info {
   struct fuse_args args;
@@ -53,7 +62,7 @@ int FuseStore::open_file(string p, struct fuse_file_info *fi,
   }
   OpenFile *o = new OpenFile;
   o->path = p;
-  o->bl.claim(bl);
+  o->bl = std::move(bl);
   open_files[p] = o;
   fi->fh = reinterpret_cast<uint64_t>(o);
   ++o->ref;
@@ -721,7 +730,7 @@ static int os_open(const char *path, struct fuse_file_info *fi)
 
   if (pbl) {
     FuseStore::OpenFile *o = new FuseStore::OpenFile;
-    o->bl.claim(*pbl);
+    o->bl = std::move(*pbl);
     fi->fh = reinterpret_cast<uint64_t>(o);
   }
   return 0;
@@ -868,7 +877,7 @@ static int os_create(const char *path, mode_t mode, struct fuse_file_info *fi)
 
   if (pbl) {
     FuseStore::OpenFile *o = new FuseStore::OpenFile;
-    o->bl.claim(*pbl);
+    o->bl = std::move(*pbl);
     o->dirty = true;
     fi->fh = reinterpret_cast<uint64_t>(o);
   }