From: Sage Weil <sage@redhat.com>
Date: Sat, 10 Mar 2018 20:52:45 +0000 (-0600)
Subject: os/filestore: fix do_copy_range replay bug
X-Git-Tag: v12.2.5~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20957%2Fhead;p=ceph.git

os/filestore: fix do_copy_range replay bug

The 'from' value is an fd, not an offset.  We want 'r' to be the number of
bytes copied, or len.

It looks like this has been broken since 9499cdcd87ddac4a91abffe401baddb91f8a11d5

Fixes: http://tracker.ceph.com/issues/23298
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit df7fa174ad604822c034226593ff1eb700506e4a)
---

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 8b596a723616..cd4972c1a9d5 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -3888,7 +3888,7 @@ int FileStore::_do_copy_range(int from, int to, uint64_t srcoff, uint64_t len, u
   if (r < 0 && replaying) {
     assert(r == -ERANGE);
     derr << __FUNC__ << ": short source tolerated because we are replaying" << dendl;
-    r = pos - from;;
+    r = len;
   }
   assert(replaying || pos == end);
   if (r >= 0 && !skip_sloppycrc && m_filestore_sloppy_crc) {