From patchwork Tue Oct 25 10:18:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 10684 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp909252wru; Tue, 25 Oct 2022 02:56:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YgW/e0ydUZ1cBaWUR9pIxe0d+NVgE3l5VrJ4EgJAI9k3Gl53NMNkGQRq7GoZitK4AlM3O X-Received: by 2002:a17:903:1250:b0:185:40c6:3c2c with SMTP id u16-20020a170903125000b0018540c63c2cmr37931137plh.64.1666691809719; Tue, 25 Oct 2022 02:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666691809; cv=none; d=google.com; s=arc-20160816; b=R2rC5X+mpby8i4QLFaPPzT4scjo+rZEvvdVehBI0MjUlpXR8Lf89nkMMhWk/NHxUm4 oRWBJermP63GVUXbbXp0cZiDDwW7PRLYoSCqwyHlR/RRhZYhkNGQwjSCvYIeZLG2nSwO iWvbZ8Hm03husDI8MGHjdc2Ph3jo16wlzb+v2PEn9VoIXCHUyaVyMJ2ICuBUdYQ8cTTj LY/Fldkbj7OmJYNWMgLQBkxqFoYbwPD24wgR8C2rYbyOAn6RiXsTmyye2dwW07Cs90e8 h+q7veQgSWRCmMfzL0hmOaUo196x3qptg6Z0Hy0Gneygv7hlvq3/W/d/fyh3wPxmgg0X dU0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=qLvJR6rDDcu/zliNT57c1zK486HsvKtjff7AOTPoIEg=; b=eysw71GxLxrDrQbDaGuQcNkimj2ZfnMgGi+CvngO9ioklFIX9hVQy/QVAN7vRxWQ6F sRbprqBiP+/9LoIUXSaSmmP/fzM95nP3jhnthQt1ixu+t9bBEk09ufs2fNGvs5U7tu9i mmCQLOEJirqP0CkyCPtu0w5cUztfIak2y9I6+j2/4lXLPHxGVbPVdbOt05afADGQ1RBq yR8Hc17fqSYW+poFpBteOey4JisNllJ6myW9aITSAH3OJg8tqUEh8vLvSYE3PGrxKOQa Ro9PU1YaCTIyFt/t6Hg5EhL7BPbxPXR/e+o6BAD396Ui4QCtVZbIGQdgp52s1jIzshXf IHFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b15-20020a056a00114f00b0056bf15d0cbfsi2845122pfm.308.2022.10.25.02.56.36; Tue, 25 Oct 2022 02:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231815AbiJYJyX (ORCPT + 99 others); Tue, 25 Oct 2022 05:54:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231167AbiJYJw6 (ORCPT ); Tue, 25 Oct 2022 05:52:58 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84C6214093; Tue, 25 Oct 2022 02:49:29 -0700 (PDT) Received: from fraeml742-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4MxRtt6bPxz6H72c; Tue, 25 Oct 2022 17:47:34 +0800 (CST) Received: from lhrpeml500003.china.huawei.com (7.191.162.67) by fraeml742-chm.china.huawei.com (10.206.15.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 25 Oct 2022 11:49:27 +0200 Received: from localhost.localdomain (10.69.192.58) by lhrpeml500003.china.huawei.com (7.191.162.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 25 Oct 2022 10:49:23 +0100 From: John Garry To: , , , , , , , , , CC: , , , , , John Garry Subject: [PATCH RFC v3 22/22] scsi: libsas: Delete sas_task_slow.timer Date: Tue, 25 Oct 2022 18:18:16 +0800 Message-ID: <1666693096-180008-23-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1666693096-180008-1-git-send-email-john.garry@huawei.com> References: <1666693096-180008-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To lhrpeml500003.china.huawei.com (7.191.162.67) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747653031028559035?= X-GMAIL-MSGID: =?utf-8?q?1747653031028559035?= We now send every slow task through the block layer and use the timeout facility there, so delete sas_task_slow.timer . Signed-off-by: John Garry --- drivers/scsi/libsas/sas_init.c | 1 - drivers/scsi/libsas/sas_scsi_host.c | 1 - include/scsi/libsas.h | 3 --- 3 files changed, 5 deletions(-) diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index c3f602bd2c4c..8b0e72c447d0 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -50,7 +50,6 @@ struct sas_task *sas_alloc_slow_task(gfp_t flags) task->slow_task = slow; slow->task = task; - timer_setup(&slow->timer, NULL, 0); init_completion(&slow->completion); return task; diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index a93e019a7dbf..4fdd84868ac2 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -909,7 +909,6 @@ EXPORT_SYMBOL_GPL(sas_bios_param); void sas_task_internal_done(struct sas_task *task) { - del_timer(&task->slow_task->timer); complete(&task->slow_task->completion); } diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 60543d8b01d4..f903be5895a9 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -9,8 +9,6 @@ #ifndef _LIBSAS_H_ #define _LIBSAS_H_ - -#include #include #include #include @@ -628,7 +626,6 @@ struct sas_task_slow { /* standard/extra infrastructure for slow path commands (SMP and * internal lldd commands */ - struct timer_list timer; struct completion completion; struct sas_task *task; };