From: Adam Crume <adamcrume@gmail.com>
Date: Mon, 30 Jun 2014 14:17:32 +0000 (-0700)
Subject: lttng: Remove 'ver' from trace in code for CEPH_OSD_OP_NOTIFY
X-Git-Tag: v0.86~231^2~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=772148e25daf8ceb9bcc38bc7839003765233f05;p=ceph.git

lttng: Remove 'ver' from trace in code for CEPH_OSD_OP_NOTIFY

'ver' is obsolete and variable exists only for proper deserialization

Signed-off-by: Adam Crume <adamcrume@gmail.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 5f80b6042f9c..c280adb1b382 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3705,7 +3705,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
    case CEPH_OSD_OP_NOTIFY:
       ++ctx->num_read;
       {
-	uint32_t ver;
+	uint32_t ver; // obsolete
 	uint32_t timeout;
         bufferlist bl;
 
@@ -3716,7 +3716,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	} catch (const buffer::error &e) {
 	  timeout = 0;
 	}
-	tracepoint(osd, do_osd_op_pre_notify, soid.oid.name.c_str(), soid.snap.val, ver, timeout);
+	tracepoint(osd, do_osd_op_pre_notify, soid.oid.name.c_str(), soid.snap.val, timeout);
 	if (!timeout)
 	  timeout = cct->_conf->osd_default_notify_timeout;
 
diff --git a/src/tracing/osd.tp b/src/tracing/osd.tp
index 51f894a9d6c4..50ca23c114c1 100644
--- a/src/tracing/osd.tp
+++ b/src/tracing/osd.tp
@@ -303,12 +303,10 @@ TRACEPOINT_EVENT(osd, do_osd_op_pre_notify,
     TP_ARGS(
         const char*, oid,
         uint64_t, snap,
-        uint64_t, ver,
         uint64_t, timeout),
     TP_FIELDS(
         ctf_string(oid, oid)
         ctf_integer(uint64_t, snap, snap)
-        ctf_integer(uint64_t, ver, ver)
         ctf_integer(uint64_t, timeout, timeout)
     )
 )