From patchwork Thu Jan 24 16:35:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2033841 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B3B943FDBC for ; Thu, 24 Jan 2013 16:35:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752380Ab3AXQfN (ORCPT ); Thu, 24 Jan 2013 11:35:13 -0500 Received: from mail-ob0-f171.google.com ([209.85.214.171]:38736 "EHLO mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751919Ab3AXQfM (ORCPT ); Thu, 24 Jan 2013 11:35:12 -0500 Received: by mail-ob0-f171.google.com with SMTP id lz20so4336722obb.30 for ; Thu, 24 Jan 2013 08:35:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=VJnSe4V3v/Nnlp7QNVmlUSWajCe0resAHiMuB2zLnw4=; b=fDxKeY7nQut5WHrKtbHYPYTXwkq7k9OZINjtboVXi2lBcqzzIZBDUr69/DHYHCHDXV KOtxOE/jSuSAIuAecHxfr/HBTyKfZ3aAS53bXiGGJlLrNSMQELsCkw+sM4HGVm2DEcKH upwYR3E4qg/8y6fkuGTDUFxLeVJRX1rZls+nNYtRIrlUc/NUI3noBYSTJ6ObGfq6tP0t y0YXhmp7CDK7apuEFMsEP5Kxj4yY+HtnofSu3FAi98C4pui3fXcGWhcSohQ7W5PI7usy BWtrwKBIOYE5Ex0gL6yZjjOWg0eVSBsC07O/+3FA9HQf/xQMZ6WRglnXEBXjfO3sadze eAug== X-Received: by 10.50.151.211 with SMTP id us19mr1751372igb.84.1359045311916; Thu, 24 Jan 2013 08:35:11 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id fv6sm1392462igc.17.2013.01.24.08.35.10 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jan 2013 08:35:10 -0800 (PST) Message-ID: <510162BD.20800@inktank.com> Date: Thu, 24 Jan 2013 10:35:09 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 09/12, v2] rbd: get rid of rbd_req_sync_notify_ack() References: <50FF11EA.3000808@inktank.com> <50FF128B.1030405@inktank.com> <5101406E.4060602@inktank.com> In-Reply-To: <5101406E.4060602@inktank.com> X-Gm-Message-State: ALoCoQnz6AOJ1ggzEUq3R3W7GID8fwcg22diCApIOsRNHT3QlhOIr/egHxdJunRcEkD+Pxv/i/Ux Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Get rid rbd_req_sync_notify_ack() because it is no longer used. As a result rbd_simple_req_cb() becomes unreferenced, so get rid of that too. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 33 --------------------------------- 1 file changed, 33 deletions(-) static int rbd_req_sync_exec(struct rbd_device *rbd_dev, @@ -1866,7 +1834,6 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) rbd_warn(rbd_dev, "got notification but failed to " " update snaps: %d\n", rc); - (void) rbd_req_sync_notify_ack; /* avoid a warning */ rbd_obj_notify_ack_sync(rbd_dev, hver, notify_id); } diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e2b6230..b952b2f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1240,12 +1240,6 @@ done_err: return ret; } -static void rbd_simple_req_cb(struct ceph_osd_request *osd_req, - struct ceph_msg *msg) -{ - ceph_osdc_put_request(osd_req); -} - /* * Do a synchronous ceph osd operation */ @@ -1322,32 +1316,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request) } /* - * Request sync osd watch - */ -static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, - u64 ver, - u64 notify_id) -{ - struct ceph_osd_req_op *op; - int ret; - - op = rbd_osd_req_op_create(CEPH_OSD_OP_NOTIFY_ACK, notify_id, ver); - if (!op) - return -ENOMEM; - - ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, - rbd_dev->header_name, 0, 0, NULL, - NULL, 0, - CEPH_OSD_FLAG_READ, - op, - rbd_simple_req_cb, NULL); - - rbd_osd_req_op_destroy(op); - - return ret; -} - -/* * Synchronous osd object method call */