filestore: use IOC_CLONERANGE intead of IOC_CLONE ioctl

This is functionally equivalent, except that valgrind doesn't complain about a bad pointer passed to an ioctl. Signed-off-by: Sage Weil <[email protected]> Reviewed-by: Samuel Just <[email protected]>
zmc · Feb 23, 2012 · 86a54a6 · 86a54a6
1 parent 64ca584
commit 86a54a6
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
@@ -2731,14 +2731,10 @@ int FileStore::_clone(coll_t cid, const hobject_t& oldoid, const hobject_t& newo
     r = n;
     goto out;
   }
-  if (btrfs)
-    r = ::ioctl(n, BTRFS_IOC_CLONE, o);
-  else {
-    struct stat st;
-    ::fstat(o, &st);
-    dout(10) << "clone " << cid << "/" << oldoid << " -> " << cid << "/" << newoid << " READ+WRITE" << dendl;
-    r = _do_clone_range(o, n, 0, st.st_size, 0);
-  }
+
+  struct stat st;
+  ::fstat(o, &st);
+  r = _do_clone_range(o, n, 0, st.st_size, 0);
   if (r < 0)
     r = -errno;