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 6E81EC4321E for ; Tue, 5 Apr 2022 21:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348186AbiDEVOA (ORCPT ); Tue, 5 Apr 2022 17:14:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1441959AbiDEPgr (ORCPT ); Tue, 5 Apr 2022 11:36:47 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 442F9CBE63; Tue, 5 Apr 2022 06:50:09 -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 87C2E210DE; Tue, 5 Apr 2022 13:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1649166596; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nqI4Nh1/lciw6scYaWfi8ci+MclQTiz6KKpyRE9tP2g=; b=mG+VJv1b6NBZaAVYI4Buc1j22cyxd9tIuPwSn1iIAPboSODQ2QnvzbgI3ULd8ythBgsfrT 5h9TOCASc0Ll2IfYGxzNz9jI14mG/3NTlW6B5sBV4bu9/hUlbBYOrcUciOk+jusead9g4k 0JDZcuCk7ThDkwkHhgfvgKFKKIRV1I0= 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 16F0513522; Tue, 5 Apr 2022 13:49:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Bzj3NANJTGK1OwAAMHmgww (envelope-from ); Tue, 05 Apr 2022 13:49:55 +0000 Message-ID: Date: Tue, 5 Apr 2022 16:49:55 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH 05/12] btrfs: simplify scrub_recheck_block Content-Language: en-US To: Christoph Hellwig , Josef Bacik , David Sterba , Qu Wenruo Cc: Naohiro Aota , linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org References: <20220404044528.71167-1-hch@lst.de> <20220404044528.71167-6-hch@lst.de> From: Nikolay Borisov In-Reply-To: <20220404044528.71167-6-hch@lst.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 4.04.22 г. 7:45 ч., Christoph Hellwig wrote: > The I/O in repair_io_failue is synchronous and doesn't need a btrfs_bio, > so just use an on-stack bio. > > Signed-off-by: Christoph Hellwig > Reviewed-by: Qu Wenruo > --- > fs/btrfs/scrub.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c > index a726962a51984..74c0557e6a2f9 100644 > --- a/fs/btrfs/scrub.c > +++ b/fs/btrfs/scrub.c > @@ -1462,8 +1462,9 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info, > return scrub_recheck_block_on_raid56(fs_info, sblock); > > for (page_num = 0; page_num < sblock->page_count; page_num++) { > - struct bio *bio; > struct scrub_page *spage = sblock->pagev[page_num]; This line comes from a patch which is not yet in misc-next as a result the patch fails to apply. So which branch are those changes based off?