Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp664365ybt; Wed, 8 Jul 2020 08:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzADQlNY3bdiXUNCBf9RMgVu5NPYMJocz5Xzylb7ZUb0Ud70ZIvYWWfVjuvffY6zlkX8MiV X-Received: by 2002:a17:906:6d15:: with SMTP id m21mr51004987ejr.209.1594223153114; Wed, 08 Jul 2020 08:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594223153; cv=none; d=google.com; s=arc-20160816; b=uwsUUz6KM23JYhsgaESDkiYlZG7Ln178/PhiSwdWfAiphQ33kNsjJOVFBvS6ZSIAv9 70y4uiiB6O9WKO6buzusC1YjnfeUlNffi6Ng80fgTucnqVAJX8d+2e7lwzUtLOEK41F/ HDRWtqtaX30gF+lIJo6ME57wB+D8L2PixElfvRDC4NHpsBsRPO2JFImKbp6yyMR6J8pK mwhw7zQgdvUngEeUqeLU/lL3y2OIw0nWv1L584yw9W4xNtl2jgvrrCyO1RzgXNO/P+V9 0ssaPeVajrxiQIbhfWuSgrrGZSklXi32K4rTkOKdQWbyEm+qSSym0GwLgb08QRvpgKtz NtBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jtRl8BAJnB+hzGwzO8QAPNO+hD4MehST/QhEfGi+NYg=; b=NO/VvMfl3F6w7BwD6UwRFKNICcv78b9LZEBrqte7RleRLOlmrL0OBleCM9qM32IPY2 f5JD+KE8jdXeMBNa1+YP0gmFKKJ1BslSC9uRGgDtmPNlPV4bduedC3bUw4Qq3ovJIPGi 3XK85Pcgxd625TDV3Hl2+gR8UseDJ+OvjHNXP57heJU3Ntb2x1xLzfaKyFQPRsuoYk6x 5rL1Ntlzr5y324Vo6UAE7p0FBO0IiW840ruQAaZE4zS6jVxT3VDuDMGePdmZRRA72714 Av3lmwEJ+yDOXYC2cuA4UHIwPNCuFdZdtQBWqXEotiqvwPqzyqgYm4UIVb/jiBvl9NdM 0+RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aKF1q4/w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dm22si222646edb.499.2020.07.08.08.45.30; Wed, 08 Jul 2020 08:45:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aKF1q4/w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730478AbgGHPoD (ORCPT + 99 others); Wed, 8 Jul 2020 11:44:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730451AbgGHPlb (ORCPT ); Wed, 8 Jul 2020 11:41:31 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CE8F206DF; Wed, 8 Jul 2020 15:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594222891; bh=cV5vFB3/El2GAgoC0rrFO8na4il1gFH8qOCX0BK2jQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aKF1q4/w8zFkztZWy4s7QagTgPrcdHMXi3g5Apl601cSdoX2mrHES2kNh97IykUCc 20QU0pJJwcANZzJE6h3xoXvFIthbXGzcVHwUfhMtM97ATQUq0rFbpEJ06tvm1KqK1g coPjCrCQL3zyqKsy16niBDr8D27+fH+sh2tvt2ug= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hou Tao , Bart Van Assche , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 11/30] blk-mq-debugfs: update blk_queue_flag_name[] accordingly for new flags Date: Wed, 8 Jul 2020 11:40:57 -0400 Message-Id: <20200708154116.3199728-11-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200708154116.3199728-1-sashal@kernel.org> References: <20200708154116.3199728-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hou Tao [ Upstream commit bfe373f608cf81b7626dfeb904001b0e867c5110 ] Else there may be magic numbers in /sys/kernel/debug/block/*/state. Signed-off-by: Hou Tao Reviewed-by: Bart Van Assche Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-mq-debugfs.c | 3 +++ include/linux/blkdev.h | 1 + 2 files changed, 4 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index b3f2ba483992d..121f4c1e0697b 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -125,6 +125,9 @@ static const char *const blk_queue_flag_name[] = { QUEUE_FLAG_NAME(REGISTERED), QUEUE_FLAG_NAME(SCSI_PASSTHROUGH), QUEUE_FLAG_NAME(QUIESCED), + QUEUE_FLAG_NAME(PCI_P2PDMA), + QUEUE_FLAG_NAME(ZONE_RESETALL), + QUEUE_FLAG_NAME(RQ_ALLOC_TIME), }; #undef QUEUE_FLAG_NAME diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 32868fbedc9e9..02809e4dd661e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -585,6 +585,7 @@ struct request_queue { u64 write_hints[BLK_MAX_WRITE_HINTS]; }; +/* Keep blk_queue_flag_name[] in sync with the definitions below */ #define QUEUE_FLAG_STOPPED 0 /* queue is stopped */ #define QUEUE_FLAG_DYING 1 /* queue being torn down */ #define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */ -- 2.25.1