From patchwork Tue Feb 14 20:11:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 9572775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3FE3360578 for ; Tue, 14 Feb 2017 20:12:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C415271BC for ; Tue, 14 Feb 2017 20:12:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30EA62840E; Tue, 14 Feb 2017 20:12:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD84C271BC for ; Tue, 14 Feb 2017 20:12:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754974AbdBNUMq (ORCPT ); Tue, 14 Feb 2017 15:12:46 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:34914 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754954AbdBNUMm (ORCPT ); Tue, 14 Feb 2017 15:12:42 -0500 Received: by mail-qk0-f195.google.com with SMTP id u25so20603971qki.2 for ; Tue, 14 Feb 2017 12:12:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ie8xLWHaAYZpNMJUoD7HOFQo0CizEyFukHIa66mX/rs=; b=s99LjsRSKkLdnECMPEamghKWJJdLx9GrAJm7MNf+M7SkN37zFUZGn+exqfk9kK0RLA Joy4ah2ASyS/NXPChypEsV/vAfperH3ySasYe96hvRF4GV+NgPIWY+n10xnlyFGIcnoy e/KSyqq8CcnsaEkkX8QREsVVI+dJ0zL49YDEk2Rai1qeoN+BJQKfL/EkRzO3JndSVmfv pgFgmzfaTWX+GtQCVp5sZDieIyuT6kTObjBJ8VjSzalkiwoy9Mh6mcsjynczsW/BnhUA 91YZKSqgriO8kOT6Xuy0xINNbY7YNlTl0EjdvYGZx9AAD6vbphSZjw1QjWarGc6lRi8v jB5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ie8xLWHaAYZpNMJUoD7HOFQo0CizEyFukHIa66mX/rs=; b=btAmVhdE+vsSeft3qmD4MUKgCyycK+0aWInmlfeWShSS6wD8EmyBdr8z4PoSeZvR/Z 2mSQzSo1Q1hWMUdoSIU0ihK84rw62nlbb7s5ViH6h6sXXULYm31RxureHu2phYNB3wLV GJAiONoa80ym0RufXcESmDSu+QQokX/+PE7Fb5avRIFBNN66H2rzw9C/3+AEXdEXDTVm d1S+6KSwf6jRMPDT1EwID8QIuIXdiNQyqCin/3YkMqkFYabnBP4Jxgt8N3gfnKWOkcVa 4DTTt3lA6rdTHRHdif+EQok7cSSKE5hvfyUs1cMbz1EFfO8T6NInx2FdTDTndlT+Q2NU SdNw== X-Gm-Message-State: AMke39k5tWkeoNHOLR/1OIaJKFNajfxj72cb72O6OsgjdZW35sb5gTy0Ml6RzzGbBStHKA== X-Received: by 10.55.128.65 with SMTP id b62mr32234273qkd.302.1487103161015; Tue, 14 Feb 2017 12:12:41 -0800 (PST) Received: from dhcp-1-235.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id w138sm939945qka.27.2017.02.14.12.12.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 12:12:40 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Alex Elder Subject: [PATCH 07/15] rbd: remove now unused rbd_obj_request_wait() and helpers Date: Tue, 14 Feb 2017 21:11:56 +0100 Message-Id: <1487103124-2974-8-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1487103124-2974-1-git-send-email-idryomov@gmail.com> References: <1487103124-2974-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2967b50b48fc..68036c29c07c 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1619,44 +1619,6 @@ static void rbd_obj_request_submit(struct rbd_obj_request *obj_request) ceph_osdc_start_request(osd_req->r_osdc, osd_req, false); } -static void rbd_obj_request_end(struct rbd_obj_request *obj_request) -{ - dout("%s %p\n", __func__, obj_request); - ceph_osdc_cancel_request(obj_request->osd_req); -} - -/* - * Wait for an object request to complete. If interrupted, cancel the - * underlying osd request. - * - * @timeout: in jiffies, 0 means "wait forever" - */ -static int __rbd_obj_request_wait(struct rbd_obj_request *obj_request, - unsigned long timeout) -{ - long ret; - - dout("%s %p\n", __func__, obj_request); - ret = wait_for_completion_interruptible_timeout( - &obj_request->completion, - ceph_timeout_jiffies(timeout)); - if (ret <= 0) { - if (ret == 0) - ret = -ETIMEDOUT; - rbd_obj_request_end(obj_request); - } else { - ret = 0; - } - - dout("%s %p ret %d\n", __func__, obj_request, (int)ret); - return ret; -} - -static int rbd_obj_request_wait(struct rbd_obj_request *obj_request) -{ - return __rbd_obj_request_wait(obj_request, 0); -} - static void rbd_img_request_complete(struct rbd_img_request *img_request) {