From patchwork Wed Oct 19 08:30:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp281592wrs; Wed, 19 Oct 2022 05:02:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6kXoc2VDCeXiadUti/NAta7xowvDTeKt6haCh2NYNSCotA969A0FAgYZvrr8E5jik+0hYo X-Received: by 2002:a17:906:8453:b0:78d:b65a:abf1 with SMTP id e19-20020a170906845300b0078db65aabf1mr6197480ejy.696.1666180932035; Wed, 19 Oct 2022 05:02:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666180932; cv=none; d=google.com; s=arc-20160816; b=gLuiGW50d+Cm4297XnOMtrD1SlcR2pb6ZehZLDcjl6+szfp+UcVKrT7ykudiAwtggY yOSM6/OfKslUR5SNyRIgRvSAdFAfa2Wu8nKzm7oe/C8O0KskfpEMlNKzU/vj7u4DrWlQ +F6Qg6Hys5cYx3+rfJVm2KtbxM8Um5jmCJzHC63+Dov6zp6UTDVJBmPgdNAWk8zHa+2i iGCfWUbBeLsQnTNErzp/afNniNG5AaGKHr73oLwCB7uM2mKNeWW1sLY8fxwCbmn5+AO5 ugP4ziaUS628hlDb1IXDvgN93YljFSNXmEoJGYUF5dJ9Eo9ndAoAmb8tle5tmJHh3E6A TMlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CWQBYA6f0fpz0z9THUDJxECAi037YLTQT3I36eoED3A=; b=bAc70/HTp6IcHbBfygP6NO7IOgsM0tXMjFYFlNTLgkCmvhKnmPh9xVYqh3wAFaBwzF OY0/3t3Vl5L+Tiq6shS7u22/AVlvvX/w3jWVjRRrJJguliJhROU1oMOHiKEd79qrD36B hkfDH68xKogXkOQF2YfwzPRyOP7Y6luuBVl7vWae8rmQJNdE9OHPSN9LtklbWYuZN40j 6Uf39TzlVi3M2zW2j7IoXdG6YMk/7o4PjNGbsJB/VFsdnfeiH4ojSt7OWtwu/Bv9j6ep N4Bma0lhfzS2wFcg+7a26Ax6oXo2OhLoIem7FSOZ3H1kk2LjpVFdmJJiS7rrVx6JwLzw RSCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C0bmSx7Z; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs40-20020a1709073ea800b0078df2f22f80si14912556ejc.647.2022.10.19.05.01.44; Wed, 19 Oct 2022 05:02:12 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C0bmSx7Z; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230175AbiJSL5r (ORCPT + 99 others); Wed, 19 Oct 2022 07:57:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232315AbiJSL46 (ORCPT ); Wed, 19 Oct 2022 07:56:58 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 544D2A59A4; Wed, 19 Oct 2022 04:35:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id D826FCE2154; Wed, 19 Oct 2022 09:02:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E1B0C433D6; Wed, 19 Oct 2022 09:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170146; bh=d/SBqC/iWgZnvoilQmoMgTf/cQ6a1kVGxLMDkcIvoqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C0bmSx7ZTnh751PL9X5UQtKxFEd1tAPITCDj/Xa9BLOsshmdt+tTjlvV6YBOfzUXO DCMporOZfWJzCg/cgJoGhNeNmvRBEpF/NFbAK3YlWFLL9sJ3WuFo3Ezm0veAkQNpYe /XK2zFlaejRJi26sFaQVR4zNM383ZhDdCP6qGJU4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoph Hellwig , Ming Lei , Hannes Reinecke , Damien Le Moal , Johannes Thumshirn , Bart Van Assche , Damien Le Moal , Jens Axboe , Sasha Levin Subject: [PATCH 6.0 544/862] block: Fix the enum blk_eh_timer_return documentation Date: Wed, 19 Oct 2022 10:30:31 +0200 Message-Id: <20221019083313.997289806@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747117336718721218?= X-GMAIL-MSGID: =?utf-8?q?1747117336718721218?= From: Bart Van Assche [ Upstream commit b2bed51a5261f4266ecb857bba680a7f668d3ddf ] The documentation of the blk_eh_timer_return enumeration values does not reflect correctly how e.g. the SCSI core uses these values. Fix the documentation. Cc: Christoph Hellwig Cc: Ming Lei Cc: Hannes Reinecke Cc: Damien Le Moal Cc: Johannes Thumshirn Fixes: 88b0cfad2888 ("block: document the blk_eh_timer_return values") Signed-off-by: Bart Van Assche Reviewed-by: Johannes Thumshirn Reviewed-by: Damien Le Moal Link: https://lore.kernel.org/r/20220920200626.3422296-1-bvanassche@acm.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- include/linux/blk-mq.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 92294a5fb083..1532cd07a597 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -268,9 +268,16 @@ static inline void rq_list_move(struct request **src, struct request **dst, rq_list_add(dst, rq); } +/** + * enum blk_eh_timer_return - How the timeout handler should proceed + * @BLK_EH_DONE: The block driver completed the command or will complete it at + * a later time. + * @BLK_EH_RESET_TIMER: Reset the request timer and continue waiting for the + * request to complete. + */ enum blk_eh_timer_return { - BLK_EH_DONE, /* drivers has completed the command */ - BLK_EH_RESET_TIMER, /* reset timer and try again */ + BLK_EH_DONE, + BLK_EH_RESET_TIMER, }; #define BLK_TAG_ALLOC_FIFO 0 /* allocate starting from 0 */