From patchwork Thu Jan 4 18:00:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vacek X-Patchwork-Id: 185109 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5770933dyb; Thu, 4 Jan 2024 10:01:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGU6N/HafcK0bDNUhgZZ4O5HSaXM6DDclZoV1aNutfcgbM4tlZq6siUxLx2FfGDyquAEZrj X-Received: by 2002:a17:903:11c5:b0:1d4:3065:6647 with SMTP id q5-20020a17090311c500b001d430656647mr1023009plh.110.1704391272791; Thu, 04 Jan 2024 10:01:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704391272; cv=none; d=google.com; s=arc-20160816; b=b2ZOKy6rRvKZWYNOX4rUAJdPgEdOd0O6BLfoHx4//XW6KSR3R6Td3Z3aiZfrLpd/mJ hhVpldDDX0hod3Xtd8J77fBQ9qO3oi6y2oyT/PhF4ZWkmkEsWyqeCig2m0OMLlDqvRwd Oc5Hx7KICrpNOxXkPsCpqa0ad5BDcaVQl8pVwH0dNuhaAfMH17SQAlQ4AXug9Rtt6XVs 0f93SSOaeWYvS/EprJv6VdIZMukPvWCUZWXfVorW2djBqJuG7h6JXMobQG2arXr6FB5r hCsh6+crjVlcjPvsnXlxeLZjVOL0NIX061fVqrQhC8a+D7pEYhtWO1pnSylZ3Oac3CaY HhYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=eu5YlIQJDTB29F9zBZ6QeUpQq4Hsfh0LpNOdwuB2ABY=; fh=6iJHlF+fAcVpMC83yBd90iqhoRz1JJ48T3QjD4TnRAY=; b=w4Jg3cHxprEX9Bpia3btpZmzKyq/3L6os1B3ZDsNAQsmEKz5qQYYGXeBSsgsfzyuYU YTMtaH6hUTpQP/XyThYbulfBFwZTvsZ/39RikSCUMt/51ABLmyloo5aiyUHrftEnlPj8 Y7H/JjRKPvfK8svDo3bTH6RGhTc8otLB472muJlPU0saDk8vHmbWel2EAPFZUlnWwxde Gp2I9CRXuCy4jPNJ1Ttb3DlWgp/DMNJWovcLLpArAO4BEu+tAaT1+0CF/PFY4aO8dzSd jvL3Hc1abdHIYzw0E29BVDk/XQSUT88sJjaQGl5vk5VpLO8J22xAMYPArFXSK2WMI8zG xCBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Q/JPf4v1"; spf=pass (google.com: domain of linux-kernel+bounces-17071-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17071-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id f21-20020a170902e99500b001d420ecdaccsi21843824plb.92.2024.01.04.10.01.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 10:01:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17071-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Q/JPf4v1"; spf=pass (google.com: domain of linux-kernel+bounces-17071-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17071-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 18BFDB23DDA for ; Thu, 4 Jan 2024 18:01:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F8DC28E07; Thu, 4 Jan 2024 18:00:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q/JPf4v1" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 6365028DB0 for ; Thu, 4 Jan 2024 18:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704391244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=eu5YlIQJDTB29F9zBZ6QeUpQq4Hsfh0LpNOdwuB2ABY=; b=Q/JPf4v1fS6JZHiXzWuaJRdpMR3QiJqTUqfQLMvMvRjNjoaivCDP8nXmKzmUZCMag8ZhLF TwuCFNtQiDgCaFJaidKXGgbDe8nnmV9/Jw+2iX6JFWAdOf1YTjRWEAguN+meVBKYLEkirn ZCdil+LoF0/+ISkcBTlTcihG3vi5eLw= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-dDr8HvIjMzSUfG-Lahkm_w-1; Thu, 04 Jan 2024 13:00:38 -0500 X-MC-Unique: dDr8HvIjMzSUfG-Lahkm_w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E32323806739; Thu, 4 Jan 2024 18:00:37 +0000 (UTC) Received: from metal.redhat.com (unknown [10.45.224.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E0661121306; Thu, 4 Jan 2024 18:00:36 +0000 (UTC) From: Daniel Vacek To: Tejun Heo , Josef Bacik , Jens Axboe Cc: Daniel Vacek , cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] blk-cgroup: clean up after commit f1c006f1c685 Date: Thu, 4 Jan 2024 19:00:30 +0100 Message-ID: <20240104180031.148148-1-neelx@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787183783413944122 X-GMAIL-MSGID: 1787183783413944122 Commit f1c006f1c685 moved deletion of the list blkg->q_node from blkg_destroy() to blkg_free_workfn(). Clean up the now useless variable. Signed-off-by: Daniel Vacek Acked-by: Tejun Heo --- block/blk-cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 4b48c2c440981..2f39bd7cb6db5 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -575,13 +575,13 @@ static void blkg_destroy(struct blkcg_gq *blkg) static void blkg_destroy_all(struct gendisk *disk) { struct request_queue *q = disk->queue; - struct blkcg_gq *blkg, *n; + struct blkcg_gq *blkg; int count = BLKG_DESTROY_BATCH_SIZE; int i; restart: spin_lock_irq(&q->queue_lock); - list_for_each_entry_safe(blkg, n, &q->blkg_list, q_node) { + list_for_each_entry(blkg, &q->blkg_list, q_node) { struct blkcg *blkcg = blkg->blkcg; if (hlist_unhashed(&blkg->blkcg_node))