From patchwork Tue Jan 22 22:30:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2021181 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AF74FDF2EB for ; Tue, 22 Jan 2013 22:30:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753350Ab3AVWay (ORCPT ); Tue, 22 Jan 2013 17:30:54 -0500 Received: from mail-ia0-f182.google.com ([209.85.210.182]:55587 "EHLO mail-ia0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753220Ab3AVWay (ORCPT ); Tue, 22 Jan 2013 17:30:54 -0500 Received: by mail-ia0-f182.google.com with SMTP id w33so3622158iag.27 for ; Tue, 22 Jan 2013 14:30:53 -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=DAbTQ5SYkA6IeUgJb9PwefyKVsarbE798Ockc7MyGfU=; b=WUw/pzl6dzb8hIVEDKC7KxZhvRNa56qiNRW3GM3zGrcEvEVrnn4u+/pqm3fz8Ytg+s R4G+W14xDrMhza77/WpVtQfDbromC2Th0IRHV39VPVPQCOyiIwxazgCY5lSxZx/vJqQv 7bCDCoSXQtow1ppoQM4P1nQjsSswJjKYf4NigVthvZBfehnsqg682rmogyEurcayvvpS J+9G343liI1+S9B4aPIVAL2yEJ/0g90fPmrH2Rfl10frU/tjkTJotE97uisr8HHWIhB7 vMVp4ej4HIpjyxe3V3Yu9hEn4e6r8A+AR+jDOCxF8XLC6CxOIHnsFumx9XUytVOA/mpI QHtA== X-Received: by 10.50.40.133 with SMTP id x5mr12669201igk.32.1358893853602; Tue, 22 Jan 2013 14:30:53 -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 nj1sm12976924igc.3.2013.01.22.14.30.51 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jan 2013 14:30:52 -0800 (PST) Message-ID: <50FF1309.7050006@inktank.com> Date: Tue, 22 Jan 2013 16:30:33 -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] rbd: get rid of rbd_req_sync_notify_ack() References: <50FF11EA.3000808@inktank.com> In-Reply-To: <50FF11EA.3000808@inktank.com> X-Gm-Message-State: ALoCoQkaChtgI5DFO71/DKI63bhbvNLjvdycxxLLBjY7LEjjson4mcBNx+JdykDiuBGTkoXXWdoN 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 --- drivers/block/rbd.c | 33 --------------------------------- 1 file changed, 33 deletions(-) static int rbd_req_sync_exec(struct rbd_device *rbd_dev, @@ -1857,7 +1825,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 08465ae..a6ca5db 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1228,12 +1228,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 */ @@ -1295,32 +1289,6 @@ static int rbd_obj_request_wait(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 */