From nobody Wed Apr 1 22:20:02 2026 Received: from iad-out-008.esa.us-east-1.outbound.mail-perimeter.amazon.com (iad-out-008.esa.us-east-1.outbound.mail-perimeter.amazon.com [34.193.58.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4292E43C06C; Wed, 1 Apr 2026 13:37:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=34.193.58.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775050627; cv=none; b=oRgyzSKcTq1cgwfGgAsL2DBS7RGLCmKeDQkhFLnOYbrNPgYdad6ujtHaZzTT9nRmoiBvpV1FgJpCKHTUxJQdVnQpxwyruEhRnPcCY4Hf5P13MWKL2TSyuOmSggvKbWN2ZGufrWZvbK7IAg6sv69aOKuxbnUIJVbj/svNfysfHJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775050627; c=relaxed/simple; bh=ViYXT97lI2Z0arqoS4YYAI4QycWhfakOGGvWTVpUDL0=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=a7AT9xGBLhadfGYu7XibvD9PZG5HXvfw6NJLWmBj3ucCJO5eMkF/lu6VzSFsJtxiNfgm3T+oQznrqIRfIzBkDe7Z0Zr3x5nQQt99RFhJprVQIF3sZQoYaHr/6N7olm6Do9Yj3GV+sLlJPjjEwUDN0ZMDnUrb3TTnGFMmoMyhoR0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de; spf=pass smtp.mailfrom=amazon.de; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b=AwBT2nuK; arc=none smtp.client-ip=34.193.58.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b="AwBT2nuK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazoncorp2; t=1775050625; x=1806586625; h=from:to:cc:subject:date:message-id:references: in-reply-to:mime-version:content-transfer-encoding; bh=cpgdsRBIfybYQpKIU9QXK+ymTOvzqCHCto1T2WRCbVo=; b=AwBT2nuKJopfX2cbPO4IGg7AwalXdl87PPonf4Hv2Vi29jgq51nkW+iQ LSa1z/5cql4Ci1/EGwp2AYtx9UaPNhJ4hjjMR7JB/5uK4R/baMGIZa4Zq OA2KrFawQzglQ36IYF2Me5RjY8/DhutZ7N8ysrdkxc2w5TmDTcBJKRxsa n283jNP678KwOy7GN4R4wWvctmItcqSZydS8eOzZ2b+hOWIZD+6nQU939 LdvPCORZcqXM53I13qjikMw6VrZTQzFRNmB0aWoko5Cnd5WKaL0ikDhXt h148cmOkvHDvIfC0xw0QI7HSEsA/4gUCn+MW5n7o+kwZ6jE+tjn1AADP+ Q==; X-CSE-ConnectionGUID: 34e5EzuFRgOV31aCHGvb+A== X-CSE-MsgGUID: efuqIHR3QoqOjf3QTAMGtw== X-IronPort-AV: E=Sophos;i="6.23,153,1770595200"; d="scan'208";a="15127073" Received: from ip-10-4-10-75.ec2.internal (HELO smtpout.naws.us-east-1.prod.farcaster.email.amazon.dev) ([10.4.10.75]) by internal-iad-out-008.esa.us-east-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2026 13:37:01 +0000 Received: from EX19MTAUEC002.ant.amazon.com [72.21.196.66:16921] by smtpin.naws.us-east-1.prod.farcaster.email.amazon.dev [10.0.95.220:2525] with esmtp (Farcaster) id b4971fc6-7db9-411c-927e-3ab4757a8014; Wed, 1 Apr 2026 13:37:01 +0000 (UTC) X-Farcaster-Flow-ID: b4971fc6-7db9-411c-927e-3ab4757a8014 Received: from EX19D012UEC002.ant.amazon.com (10.252.135.254) by EX19MTAUEC002.ant.amazon.com (10.252.135.253) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Wed, 1 Apr 2026 13:37:00 +0000 Received: from EX19D012UEC003.ant.amazon.com (10.252.135.160) by EX19D012UEC002.ant.amazon.com (10.252.135.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Wed, 1 Apr 2026 13:37:00 +0000 Received: from EX19D012UEC003.ant.amazon.com ([fe80::67ea:859:1e17:25a9]) by EX19D012UEC003.ant.amazon.com ([fe80::67ea:859:1e17:25a9%3]) with mapi id 15.02.2562.037; Wed, 1 Apr 2026 13:37:00 +0000 From: "Heyne, Maximilian" To: "stable@vger.kernel.org" CC: "Heyne, Maximilian" , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , "Keith Busch" , Jens Axboe , Hector Martin , Sven Peter , Alyssa Rosenzweig , "James E.J. Bottomley" , "Martin K. Petersen" , Alim Akhtar , Avri Altman , Bart Van Assche , Sasha Levin , Peter Wang , Greg Kroah-Hartman , Bean Huo , Brian Kao , Seunghui Lee , Sanjeev Yadav , Wonkon Kim , Ming Lei , Hannes Reinecke , "linux-block@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "asahi@lists.linux.dev" , "linux-arm-kernel@lists.infradead.org" , "linux-nvme@lists.infradead.org" , "linux-scsi@vger.kernel.org" Subject: [PATCH 6.1.y 3/8] scsi: remove an extra queue reference Thread-Topic: [PATCH 6.1.y 3/8] scsi: remove an extra queue reference Thread-Index: AQHcwdydSAl8T/8/v0W8CfQbTcumKA== Date: Wed, 1 Apr 2026 13:37:00 +0000 Message-ID: <20260401-blobs-hurry-1dd1b23c@mheyne-amazon> References: <20260401-defer-gleam-5226cb65@mheyne-amazon> In-Reply-To: <20260401-defer-gleam-5226cb65@mheyne-amazon> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christoph Hellwig [ Upstream commit dc917c361422388f0d39d3f0dc2bc5a188c01156 ] Now that blk_mq_destroy_queue does not release the queue reference, there is no need for a second queue reference to be held by the scsi_device. Signed-off-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Reviewed-by: Chaitanya Kulkarni Reviewed-by: Keith Busch Link: https://lore.kernel.org/r/20221018135720.670094-3-hch@lst.de Signed-off-by: Jens Axboe Signed-off-by: Maximilian Heyne --- drivers/scsi/scsi_scan.c | 1 - drivers/scsi/scsi_sysfs.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 696f178fb57d8..0eaec372f7560 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -344,7 +344,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_= target *starget, sdev->request_queue =3D q; q->queuedata =3D sdev; __scsi_init_queue(sdev->host, q); - WARN_ON_ONCE(!blk_get_queue(q)); =20 depth =3D sdev->host->cmd_per_lun ?: 1; =20 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index af81b2ba0c9b3..456b92c3a7811 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1486,7 +1486,6 @@ void __scsi_remove_device(struct scsi_device *sdev) mutex_unlock(&sdev->state_mutex); =20 blk_mq_destroy_queue(sdev->request_queue); - blk_put_queue(sdev->request_queue); kref_put(&sdev->host->tagset_refcnt, scsi_mq_free_tags); cancel_work_sync(&sdev->requeue_work); =20 --=20 2.50.1 Amazon Web Services Development Center Germany GmbH Tamara-Danz-Str. 13 10243 Berlin Geschaeftsfuehrung: Christof Hellmis, Andreas Stieger Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597