From: Samuel Just <sjust@redhat.com>
Date: Tue, 18 Oct 2016 21:47:21 +0000 (-0700)
Subject: ReplicatedPG: update zero and truncate to only disallow aligned append pools
X-Git-Tag: v11.1.0~245^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=126ada47494658242d2c20c947bc7d9c8f21721e;p=ceph.git

ReplicatedPG: update zero and truncate to only disallow aligned append pools

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 4e01744519cc..3e3a87e370d0 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5276,7 +5276,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 
     case CEPH_OSD_OP_ZERO:
       tracepoint(osd, do_osd_op_pre_zero, soid.oid.name.c_str(), soid.snap.val, op.extent.offset, op.extent.length);
-      if (pool.info.require_rollback()) {
+      if (pool.info.requires_aligned_append()) {
 	result = -EOPNOTSUPP;
 	break;
       }
@@ -5333,7 +5333,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 
     case CEPH_OSD_OP_TRUNCATE:
       tracepoint(osd, do_osd_op_pre_truncate, soid.oid.name.c_str(), soid.snap.val, oi.size, oi.truncate_seq, op.extent.offset, op.extent.length, op.extent.truncate_size, op.extent.truncate_seq);
-      if (pool.info.require_rollback()) {
+      if (pool.info.requires_aligned_append()) {
 	result = -EOPNOTSUPP;
 	break;
       }