Merge pull request #7179 from dachary/wip-14287-hammer

hammer: ReplicatedPG: wrong result code checking logic during sparse_read Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Jan 14, 2016 · 4e67418 · 4e67418
2 parents 28e99a9 + 1ab2b48
commit 4e67418
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -3575,6 +3575,11 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	  data_bl.claim_append(tmpbl);
 	  last = miter->first + r;
         }
+
+        if (r < 0) {
+          result = r;
+          break;
+        }
 
 	// verify trailing hole?
 	if (cct->_conf->osd_verify_sparse_read_holes) {
@@ -3590,11 +3595,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	  }
 	}
 
-        if (r < 0) {
-          result = r;
-          break;
-        }
-
         op.extent.length = total_read;
 
         ::encode(m, osd_op.outdata);