From: David Disseldorp <ddiss@suse.de>
Date: Fri, 9 Oct 2015 11:56:46 +0000 (+0200)
Subject: osd: remove unnecessary CMPEXT locking comment
X-Git-Tag: rrygrvmctuzz-build-me~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=969d8755f73fbe22edf5538da610b3337e226da9;p=ceph.git

osd: remove unnecessary CMPEXT locking comment

COMPARE AND WRITE operations are implemented by the kernel RBD client
using compound cmpext + write OSD requests. Such requests are handled
by OSDs in a serialized fashion, ensuring that no extra locking is
required for object atomicity; (bnc#948986).

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 5993e81d5d73a137783e39df620d5a32c58e6d8f)
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 461fda80016..38ffc7dfd36 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3474,7 +3474,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 
     case CEPH_OSD_OP_CMPEXT:
 	tracepoint(osd, do_osd_op_pre_extent_cmp, 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);
-        // TODO: Locking - this op and the write are supposed to be atomic
 	result = do_extent_cmp(ctx, osd_op);
 	break;