From patchwork Tue Jan 29 15:47:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 10786517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1305014E1 for ; Tue, 29 Jan 2019 15:47:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 010262CEEC for ; Tue, 29 Jan 2019 15:47:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E99992CEED; Tue, 29 Jan 2019 15:47:57 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 9DE322CDE7 for ; Tue, 29 Jan 2019 15:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbfA2Pr4 (ORCPT ); Tue, 29 Jan 2019 10:47:56 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45456 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725846AbfA2Pr4 (ORCPT ); Tue, 29 Jan 2019 10:47:56 -0500 Received: by mail-wr1-f66.google.com with SMTP id t6so22579351wrr.12 for ; Tue, 29 Jan 2019 07:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=E4MKslIV05xWh4l1wKj2vgGSS530K1EBt3sGfeVP3ow=; b=unPgHVyrO9lhEMVu1VjEChVc5/mIu91L+pjHPNtBLqXQGJdtnHGT905xU8FpL1nzEl X1OCzHjZ7HKDR4RmRs0MEQKh6PWrNwheeg15ANU4vWYqvna0X4uRW+o5iX1hY0M7H2C4 OWXnOYuRphpVy9DKzqSZ3IwYhvAjHQiHI4RRRC/ueQPTjATk0JKo8lWm/YOIENzbKzkO JumOHFF1A2WyBI/HLDgyug5SzTYx7/hP3Go/zgE7BFTS4Pwe1DiLp6IHQgR7usSVav6Z QmAPAbu6k/WcCE2WH8fy/yAVV0a0DQrsZREOP08TBxUu/fgL7d5oFRQaKSFvzXYT0WsI 8A8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=E4MKslIV05xWh4l1wKj2vgGSS530K1EBt3sGfeVP3ow=; b=clvtWivLTQaHwEfltLX9MqLUcHg7lySKSBC/mXN68a0HsW0qnhiaj2Ky21IjHetfna 5byH1V6EKO1V5iBxbWMNMKy6Ezco6LZcE2ih80TLM/i5VbIJoP7Ztt46CXa78NAGg4eV 7ZJ9hNRcf91vA0UpnqoaiqOWufUrXzlYvMiUwgXFhRSxmzfZwxWzNAW1GrU/n1B8Z4yQ Up3Lkw5OpYUNUYG6c0T9ZjWfwTJPh6+aFEHOymZGHX0Ffo+4zFU8Y5ceTbrXX9H/nert 5JZA+f/dtA2i/2syil7qta3EAeQPdR8wZWI34m0V7XmrdVMDt/9yh5aZBhlWeZgzrJpe nlHQ== X-Gm-Message-State: AJcUukdBDzPlj1MI1y8loaBfNyQhXuFIn5ySU3qsqwXITZtpT/9s5HBr 1Prndx69mIK8yJHjfl3woaw3x0dQ X-Google-Smtp-Source: ALg8bN7oDNctQrS06HJHlrm31rI9VGZ8Rm9/Z7wAfz+dglqJ37T3QOVBlgWyzS8caDo2aX9snMRsYw== X-Received: by 2002:adf:ee89:: with SMTP id b9mr27410387wro.246.1548776874408; Tue, 29 Jan 2019 07:47:54 -0800 (PST) Received: from orange.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id g9sm3129423wmg.44.2019.01.29.07.47.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Jan 2019 07:47:53 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 1/3] rbd: get rid of obj_req->obj_request_count Date: Tue, 29 Jan 2019 16:47:27 +0100 Message-Id: <20190129154729.1031-2-idryomov@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20190129154729.1031-1-idryomov@gmail.com> References: <20190129154729.1031-1-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 It is effectively unused. Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2f91dee0ab5f..7f78b814d57f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -291,7 +291,6 @@ struct rbd_img_request { int result; /* first nonzero obj_request result */ struct list_head object_extents; /* obj_req.ex structs */ - u32 obj_request_count; u32 pending_count; struct kref kref; @@ -1345,7 +1344,6 @@ static inline void rbd_img_obj_request_add(struct rbd_img_request *img_request, /* Image request now owns object's original reference */ obj_request->img_request = img_request; - img_request->obj_request_count++; img_request->pending_count++; dout("%s: img %p obj %p\n", __func__, img_request, obj_request); } @@ -1355,8 +1353,6 @@ static inline void rbd_img_obj_request_del(struct rbd_img_request *img_request, { dout("%s: img %p obj %p\n", __func__, img_request, obj_request); list_del(&obj_request->ex.oe_item); - rbd_assert(img_request->obj_request_count > 0); - img_request->obj_request_count--; rbd_assert(obj_request->img_request == img_request); rbd_obj_request_put(obj_request); } @@ -1672,7 +1668,6 @@ static void rbd_img_request_destroy(struct kref *kref) for_each_obj_request_safe(img_request, obj_request, next_obj_request) rbd_img_obj_request_del(img_request, obj_request); - rbd_assert(img_request->obj_request_count == 0); if (img_request_layered_test(img_request)) { img_request_layered_clear(img_request);