From: yangjun <yangjun@cmss.chinamobile.com>
Date: Wed, 31 Jul 2019 09:40:38 +0000 (+0800)
Subject: OSD: modify n.cookie to op.notify.cookie
X-Git-Tag: v15.1.0~1904^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37804be48061e12bd7bc0882e7481594c5508bd8;p=ceph.git

OSD: modify n.cookie to op.notify.cookie

In the condition of "CEPH_OSD_OP_NOTIFY", "n.cookie"should be "op.notify.cookie"
instead of "op.watch.cookie", it's easier to be understood.

Signed-off-by: yangjun <yangjun@cmss.chinamobile.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index d85ce1d3a633..5b6be10f60d0 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -6221,7 +6221,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	notify_info_t n;
 	n.timeout = timeout;
 	n.notify_id = osd->get_next_id(get_osdmap_epoch());
-	n.cookie = op.watch.cookie;
+	n.cookie = op.notify.cookie;
         n.bl = bl;
 	ctx->notifies.push_back(n);