From patchwork Fri Jul 31 16:32:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 6914561 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CCAA89F39D for ; Fri, 31 Jul 2015 16:33:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8F1F203AB for ; Fri, 31 Jul 2015 16:33:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15D69205BB for ; Fri, 31 Jul 2015 16:33:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752995AbbGaQdN (ORCPT ); Fri, 31 Jul 2015 12:33:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:56219 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752940AbbGaQdK (ORCPT ); Fri, 31 Jul 2015 12:33:10 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3ED80ABE9; Fri, 31 Jul 2015 16:33:09 +0000 (UTC) From: David Disseldorp To: mchristi@redhat.com Cc: ceph-devel@vger.kernel.org, target-devel@vger.kernel.org, David Disseldorp Subject: [PATCH 4/4] osd: fix extent_cmp tracepoint call Date: Fri, 31 Jul 2015 18:32:53 +0200 Message-Id: <1438360373-14377-2-git-send-email-ddiss@suse.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438360373-14377-1-git-send-email-ddiss@suse.de> References: <1438161946-28473-1-git-send-email-mchristi@redhat.com> <1438360373-14377-1-git-send-email-ddiss@suse.de> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The size and seq variables are out of scope. Signed-off-by: David Disseldorp --- src/osd/ReplicatedPG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2890af3..aed609b 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3501,7 +3501,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) // --- READS --- case CEPH_OSD_OP_CMPEXT: - tracepoint(osd, do_osd_op_pre_extent_cmp, soid.oid.name.c_str(), soid.snap.val, size, seq, op.extent.offset, op.extent.length, op.extent.truncate_size, op.extent.truncate_seq); + 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;