Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 53F0C3E715A; Fri, 5 Jun 2026 18:44:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685095; cv=none; b=qoglDOYT8Fl6XLR0dU8zanx9eTlKz+EIEbFc+elGlKtUfE+NAuzmphnj5hdgr34eZ8W4qMOpPpK/Kthc20YLOyxyj+KHosKX19xRihXx7NSbDKU30GFEIhVS7Z37egamRIEK6gGNV1S5OYJLNlsBl9eQlkFlr3m/IGAlXhbWDQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685095; c=relaxed/simple; bh=9gp7r8gjYnNVIZuo+Rk+PCRN59UW0iVUDFCiJrslEYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nUEGbVnplKrpMORdv6gTmDip4RQlcZ48sBJBhxc3ziuC8lglqtO+aKr9UM7NiHaEmtQnxEMpw0+ovXdMgOUSYK0+UkLQQ+Zlpqx8Yn+SALSE91mRvO3ubuK461MEPz8ARHqMjEQi7egWWHItc3GY4WRT7F+QmL2rvrH8N1q/yCc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=u/apyIP/; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="u/apyIP/" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=JVc5dYNGAfnZ4n31NUzCZhYmbjZa8f+2tpl8e8qhOXQ=; b=u/apyIP/ADHPW1r2XaDKGxAjoz DRH49wPtDDJwKQJLwRGhg7KW4t0aXIt/0oA3QHN5o28Wg4ssuCASGEdsev02AQB7OdREH96rhrnRv mY0All5qE4ZlIOH6m+n4kO7c9SebVMehnalTd4fpA9R0gOOTXF7Uv1bmquzVO2F/SeEGDAxxhIFCx 3mjATvVSxFxxHmfT7jqrSHHa+O46rnXQE3vvvwdFQduP9hzO7NWw7o3wb8OjtWbiXOcChrnu3ffvp khBfsOn1af0AlcKD82JJY5tA5PsQYEn+mYnrNsjpSEyzLd3Ph7nF/AX34+PEwnFYLPO4J4cPb51GH pA+B0piA==; Received: from 2a02-8389-2341-5b80-decc-1a96-daaa-a2cc.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:decc:1a96:daaa:a2cc] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.99.1 #2 (Red Hat Linux)) id 1wVZXI-000000014Pg-13lL; Fri, 05 Jun 2026 18:44:52 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Jonathan Corbet , linux-block@vger.kernel.org, linux-doc@vger.kernel.org, Keith Busch Subject: [PATCH 2/4] block: add a "tag" for block status codes Date: Fri, 5 Jun 2026 20:44:28 +0200 Message-ID: <20260605184441.590927-3-hch@lst.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260605184441.590927-1-hch@lst.de> References: <20260605184441.590927-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html The full name of the status codes is not good for user interfaces as it can contain white spaces. Add the name of the status code without the BLK_STS_ prefix as a tag so that it can be used for user interfaces. Signed-off-by: Christoph Hellwig Reviewed-by: Keith Busch --- block/blk-core.c | 28 ++++++++++++++++++++++++++++ block/blk.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/block/blk-core.c b/block/blk-core.c index 1614323282f1..7aa9cd110bdd 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -135,10 +135,12 @@ EXPORT_SYMBOL_GPL(blk_op_str); #define ENT(_tag, _errno, _desc) \ [BLK_STS_##_tag] = { \ .errno = _errno, \ + .tag = __stringify(_tag), \ .name = _desc, \ } static const struct { int errno; + const char *tag; const char *name; } blk_errors[] = { ENT(OK, 0, ""), @@ -203,6 +205,32 @@ const char *blk_status_to_str(blk_status_t status) return blk_errors[idx].name; } +const char *blk_status_to_tag(blk_status_t status) +{ + int idx = (__force int)status; + + if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors))) + return ""; + return blk_errors[idx].tag; +} + +blk_status_t tag_to_blk_status(const char *tag) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(blk_errors); i++) { + if (blk_errors[i].tag && + !strcmp(blk_errors[i].tag, tag)) + return (__force blk_status_t)i; + } + + /* + * Return BLK_STS_OK for mismatches as this function is intended to + * parse error status values. + */ + return BLK_STS_OK; +} + /** * blk_sync_queue - cancel any pending callbacks on a queue * @q: the queue diff --git a/block/blk.h b/block/blk.h index bf1a80493ff1..10426d23f662 100644 --- a/block/blk.h +++ b/block/blk.h @@ -50,6 +50,8 @@ struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, void blk_free_flush_queue(struct blk_flush_queue *q); const char *blk_status_to_str(blk_status_t status); +const char *blk_status_to_tag(blk_status_t status); +blk_status_t tag_to_blk_status(const char *tag); bool __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic); bool blk_queue_start_drain(struct request_queue *q); -- 2.53.0