Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp280382ybi; Wed, 29 May 2019 21:17:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqwe1r06AUV26X6CnlwS4itU8hJM3kz6s4yHbmcOyU5PrxVWg82qhIODCfDay2vuPzmZsBza X-Received: by 2002:a65:64c9:: with SMTP id t9mr1893296pgv.221.1559189833878; Wed, 29 May 2019 21:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559189833; cv=none; d=google.com; s=arc-20160816; b=CngnQ1xyA13WBnT5JDi7etvhYYwFyM6XdseMU9wTphOCHmI5eOew7qkjJfCq5lMntH zNxOKDxxbT9aT+ueUMiRsgMliKEcKzCOK513QUloaxeAg/2Vh74WKBPhSlzDIcLQbjqi HmvtTd9pH1FqsUcUGSRc+c5Whr3fnP6m0tcKfGS9b/07em+C9+WJ1kEkNhPf3ob9vVq9 /it+rB47y9qRbXTWPpv0XVFz+Js954hAVusbXG5XH/M79pERtCmx5ib352xy0oAn0o21 q74hi2lxqH6rsefzxBdUZPebehHt2FqjPaMhYrtJN8DOIrunJSRrXKlYxRWD8JyXYzRN mwGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gQ0bBASo8xkRy8wu3e4K132GXrcjdxU2L/Vya+ceKMk=; b=Q8ekQDGybzDeRv3uEBTuJdSHz2FLPWJ2Uu2Sr22uT2RBBarF6nLBorw6tSbwXsRy1P mSTCyqKL4+8zxSaUPdyerupywX/8KjQ/gNoQlO9mLiGrWT6UzpppxfkI9UFtf7sdN7CP Z2xHQNQM9Z8H/h/bjEuZ7a/8nuNuXG16fuV4xNkjgPt9QJyRrnuMpv4p146Rl0zr2h4i InWZR7tlG9q60i4zfu0pwxVqRBcUnOipMJFsVO1T0AIwphnnbvUiqWTt+xY5IDYN7M0k QS2B+hW5k/58RYph52NX/Hdf9fuiX2SGhy6sdYKCQFnJNbnru/ZPT07r4k9JyCllUn9I Rbeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eQC4kKmg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bh11si1927462plb.383.2019.05.29.21.16.58; Wed, 29 May 2019 21:17:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eQC4kKmg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731051AbfE3EO5 (ORCPT + 99 others); Thu, 30 May 2019 00:14:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:41316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730588AbfE3DQG (ORCPT ); Wed, 29 May 2019 23:16:06 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 F15C82458A; Thu, 30 May 2019 03:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186166; bh=IMvOMrwfmvlEvp9BbnZTOcWW0xU9lq/DlMKMHRjOHos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eQC4kKmgllhC5LnVhEhoD0Px4lST3TH1EpstctPUnFrIlL+7UsGtovUmPNiCUk0ij XzY8Fpl9qksqHynf2pJEEaVqeo5gESof/yBEteFRuB5YOo2mRlytTlkzRxEMiGBBGX 5UTyMTMqdx4OaTrlIZ72kW2rLB1C6BcYimMPUmBc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , Anand Jain , David Sterba Subject: [PATCH 4.19 018/276] Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path Date: Wed, 29 May 2019 20:02:56 -0700 Message-Id: <20190530030525.139495426@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Filipe Manana commit 72bd2323ec87722c115a5906bc6a1b31d11e8f54 upstream. Currently when we fail to COW a path at btrfs_update_root() we end up always aborting the transaction. However all the current callers of btrfs_update_root() are able to deal with errors returned from it, many do end up aborting the transaction themselves (directly or not, such as the transaction commit path), other BUG_ON() or just gracefully cancel whatever they were doing. When syncing the fsync log, we call btrfs_update_root() through tree-log.c:update_log_root(), and if it returns an -ENOSPC error, the log sync code does not abort the transaction, instead it gracefully handles the error and returns -EAGAIN to the fsync handler, so that it falls back to a transaction commit. Any other error different from -ENOSPC, makes the log sync code abort the transaction. So remove the transaction abort from btrfs_update_log() when we fail to COW a path to update the root item, so that if an -ENOSPC failure happens we avoid aborting the current transaction and have a chance of the fsync succeeding after falling back to a transaction commit. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203413 Fixes: 79787eaab46121 ("btrfs: replace many BUG_ONs with proper error handling") Cc: stable@vger.kernel.org # 4.4+ Signed-off-by: Filipe Manana Reviewed-by: Anand Jain Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/root-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -132,10 +132,8 @@ int btrfs_update_root(struct btrfs_trans return -ENOMEM; ret = btrfs_search_slot(trans, root, key, path, 0, 1); - if (ret < 0) { - btrfs_abort_transaction(trans, ret); + if (ret < 0) goto out; - } if (ret != 0) { btrfs_print_leaf(path->nodes[0]);