From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD5BEC7EE30 for ; Mon, 8 May 2023 13:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234291AbjEHNBl (ORCPT ); Mon, 8 May 2023 09:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232069AbjEHNBf (ORCPT ); Mon, 8 May 2023 09:01:35 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C74A6394BA; Mon, 8 May 2023 06:01:32 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3105721F5C; Mon, 8 May 2023 13:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1683550891; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qFCh73A4sxmR/z8hbrywbKblKOGm63yRahFfaFJq1dU=; b=B9e3LxDyZgvZ6bVvEBO8thqaY/eGz3vBFrU1Hg+5bvlewzyygcK6Q8wC35Snhh9bmmDs/z d9RKG129n7FSws9P8t5vHy3lq86dz7knGPEvhQIvcJBlPeW1/qpMW9kUkS5NRlS63LrOsH 80VWL7Zz8NiY85bvP+PZ/lgMoObBDwo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1683550891; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qFCh73A4sxmR/z8hbrywbKblKOGm63yRahFfaFJq1dU=; b=iG4Bjs7XvhjXfe+PdDT8RPV9RlujTCToaBNGFyYpZGXNlJi6kornkwJ1dvfYZOM3y4pLLe EqjPijYGzAozc/Bg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F101713A13; Mon, 8 May 2023 13:01:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id rpG5OqryWGSjXQAAMHmgww (envelope-from ); Mon, 08 May 2023 13:01:30 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id D5AF9A074F; Sun, 7 May 2023 21:05:20 +0200 (CEST) Date: Sun, 7 May 2023 21:05:20 +0200 From: Jan Kara To: Christoph Hellwig Cc: Jens Axboe , Al Viro , Christian Brauner , "Darrick J. Wong" , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Subject: Re: [PATCH 2/9] block: avoid repeated work in blk_mark_disk_dead Message-ID: <20230507190520.chcti63xrvcfqgol@quack3> References: <20230505175132.2236632-1-hch@lst.de> <20230505175132.2236632-3-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230505175132.2236632-3-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Fri 05-05-23 13:51:25, Christoph Hellwig wrote: > Check if GD_DEAD is already set in blk_mark_disk_dead, and don't > duplicate the work already done. > > Signed-off-by: Christoph Hellwig Looks good to me. Feel free to add: Reviewed-by: Jan Kara Honza > --- > block/genhd.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 461999e9489937..9a35b8443f0b5f 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -586,7 +586,9 @@ void blk_mark_disk_dead(struct gendisk *disk) > /* > * Fail any new I/O. > */ > - set_bit(GD_DEAD, &disk->state); > + if (test_and_set_bit(GD_DEAD, &disk->state)) > + return; > + > if (test_bit(GD_OWNS_QUEUE, &disk->state)) > blk_queue_flag_set(QUEUE_FLAG_DYING, disk->queue); > > -- > 2.39.2 > -- Jan Kara SUSE Labs, CR