From: Samuel Just <sjust@redhat.com>
Date: Sat, 19 Nov 2016 01:38:11 +0000 (-0800)
Subject: ECTransaction::get_write_plan: fix bug with substripe write with aligned offset
X-Git-Tag: v11.1.0~58^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=001c759e367589c8a27e98d14539295c1b63a36a;p=ceph.git

ECTransaction::get_write_plan: fix bug with substripe write with aligned offset

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ECTransaction.h b/src/osd/ECTransaction.h
index e1a18b847631..a60b39c5a811 100644
--- a/src/osd/ECTransaction.h
+++ b/src/osd/ECTransaction.h
@@ -117,7 +117,7 @@ namespace ECTransaction {
 	    sinfo.logical_to_next_stripe_offset(
 	      extent.get_off() + extent.get_len());
 	  if (tail_start != tail_finish &&
-	      tail_start != head_start &&
+	      (head_start == head_finish || tail_start != head_start) &&
 	      tail_start < projected_size) {
 	    assert(tail_finish <= projected_size);
 	    assert(tail_finish - tail_start == sinfo.get_stripe_width());