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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E747C388F7 for ; Mon, 9 Nov 2020 13:31:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40C1E2065D for ; Mon, 9 Nov 2020 13:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928719; bh=hewyRrPRKVDXdCUStdKPIGTlfU0j/MJx69/DskM30lM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lVXCiy5ZjeDV3BMzZfehk0HVcDVlHGbYn/+dCAy8E25gC3zqEm2cyr2eB2pfCZOW5 jjtbzsBy2nigOQ65HqrGeQ22gfMj9CeATfByDqSAYGVQk4ZCeTHKQNrx7awH0C0xT0 6qmhCtXjkV4d2Gej4tAmBluJ0+k0Ntw1Vs8wtjZU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731637AbgKINb6 (ORCPT ); Mon, 9 Nov 2020 08:31:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:33220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731653AbgKINIZ (ORCPT ); Mon, 9 Nov 2020 08:08:25 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC4772083B; Mon, 9 Nov 2020 13:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927305; bh=hewyRrPRKVDXdCUStdKPIGTlfU0j/MJx69/DskM30lM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ijl4oA6uBczUyOYLB4f4ir1zGqJqTdFo7ofPDZUJCmZKIgI8q8nNmvyw8PRFa3mwW IiMiAP5NoxbzEXE6O77MguEwL+3TzIgi3edNFy9MdBETf2NYEHgBtdsSMmQlRv/Aeq ImgH31kjgc7AvpQaCqi6bsw7vRCn+pqTUxszol4A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings Subject: [PATCH 4.19 15/71] Revert "btrfs: flush write bio if we loop in extent_write_cache_pages" Date: Mon, 9 Nov 2020 13:55:09 +0100 Message-Id: <20201109125020.634217572@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125019.906191744@linuxfoundation.org> References: <20201109125019.906191744@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Hutchings This reverts commit 860473714cbe7fbedcf92bfe3eb6d69fae8c74ff. That has an incorrect upstream commit reference, and was modified in a way that conflicts with some older fixes. We can cleanly cherry-pick the upstream commit *after* those fixes. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/extent_io.c | 8 -------- 1 file changed, 8 deletions(-) --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4045,14 +4045,6 @@ retry: */ scanned = 1; index = 0; - - /* - * If we're looping we could run into a page that is locked by a - * writer and that writer could be waiting on writeback for a - * page in our current bio, and thus deadlock, so flush the - * write bio here. - */ - flush_write_bio(epd); goto retry; }