From patchwork Fri Jan 31 10:37:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 11359563 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C038B112B for ; Fri, 31 Jan 2020 10:38:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A8BA2206F0 for ; Fri, 31 Jan 2020 10:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728417AbgAaKiI (ORCPT ); Fri, 31 Jan 2020 05:38:08 -0500 Received: from mx2.suse.de ([195.135.220.15]:55862 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728325AbgAaKiF (ORCPT ); Fri, 31 Jan 2020 05:38:05 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id EE52AB01E; Fri, 31 Jan 2020 10:38:01 +0000 (UTC) From: Hannes Reinecke To: Ilya Dryomov Cc: Sage Weil , Daniel Disseldorp , Jens Axboe , ceph-devel@vger.kernel.org, linux-block@vger.kernel.org, Hannes Reinecke Subject: [PATCH 10/15] rbd: kill 'work_result' Date: Fri, 31 Jan 2020 11:37:34 +0100 Message-Id: <20200131103739.136098-11-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200131103739.136098-1-hare@suse.de> References: <20200131103739.136098-1-hare@suse.de> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Use 'pending_result' instead of 'work_result' and kill the latter. Signed-off-by: Hannes Reinecke --- drivers/block/rbd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a6c95b6e9c0c..671e941d6edf 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -352,7 +352,6 @@ struct rbd_img_request { struct mutex state_mutex; int pending_result; struct work_struct work; - int work_result; struct kref kref; }; @@ -2834,13 +2833,13 @@ static void rbd_img_handle_request_work(struct work_struct *work) struct rbd_img_request *img_req = container_of(work, struct rbd_img_request, work); - rbd_img_handle_request(img_req, img_req->work_result); + rbd_img_handle_request(img_req, img_req->pending_result); } static void rbd_img_schedule(struct rbd_img_request *img_req, int result) { INIT_WORK(&img_req->work, rbd_img_handle_request_work); - img_req->work_result = result; + img_req->pending_result = result; queue_work(rbd_wq, &img_req->work); }