From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 19 Jan 2015 17:45:25 +0000 (-0500)
Subject: Revert "rbd: ObjectCacher reads can hang when reading sparse files"
X-Git-Tag: v0.80.8.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ccd1d379d02da5371cebf962465757b0ac741ab;p=ceph-ci.git

Revert "rbd: ObjectCacher reads can hang when reading sparse files"

This reverts commit 711a7e6f81983ff2091caa0f232af914a04a041c.
---

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 58fc6e5ca34..e804674ffe2 100644
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -710,9 +710,6 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid,
       }
     }
 
-    ls.splice(ls.end(), waitfor_read);
-    waitfor_read.clear();
-
     // apply to bh's!
     loff_t opos = start;
     while (true) {
@@ -767,6 +764,9 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid,
       loff_t oldpos = opos;
       opos = bh->end();
 
+      ls.splice(ls.end(), waitfor_read);
+      waitfor_read.clear();
+
       if (r == -ENOENT) {
 	if (trust_enoent) {
 	  ldout(cct, 10) << "bh_read_finish removing " << *bh << dendl;