Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp2968622imm; Sun, 1 Jul 2018 09:22:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJIqhhNvWYST/xdOWWlv2iJzS0VZuiLU3fpCMz8IEZS+mh2IATuQZFJ5ndBuRsp1tqOyr3g X-Received: by 2002:a63:82c7:: with SMTP id w190-v6mr18991596pgd.253.1530462128884; Sun, 01 Jul 2018 09:22:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530462128; cv=none; d=google.com; s=arc-20160816; b=r8E6YHyVZKvCxKQ2NV2Y6/7pRGD5ab8BArCP6fvZpfcel80H+55h3jrGH2nVsrnNpx F896gX1yGw3pvorltwykCSf5daYr7Zrr8K38VMVQugwumX059ZVNRcX4o2bGBzoU7nL8 lqzec8FPLcVjRZ4zljm9ApJGsU5z6IAa8Xda/wOF0/ro+/3A/mT0FrsarNMtOpIwvAP9 /sGw56Tc14t/fdIl2T/oz9nJN20b0Ya0YPpXlQcA2dWahPuV2WP5n21LKQDWBX3RJLt+ wK8hyTfbdSjmCmhFttL2fyUaUK8F0RLZSvHtRkUCPmmCMCfvFiapGrSN8ZGtO8j+9S0V MIIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=V28dVyxxrUzKm2x07Qvi4SS7es0m6Vgg3IPsPy6eo24=; b=xR5PmJOSN7QfjoTrV//8ndHK152y/w/St+NDEYi6J1Y9oEsLD36Oxn5b6en4dFLn7v ycdHfQQTPP0Bc0B/Oj483zeyziGSpbNKU6RMfFaWkSSAK+yqpFlMkN5HTQ5KabXrePrv t0OFmx3FNjk6wy6tsxSNdsZCRzegAfFqHqc8LPL+2xkQwIb/4uGOjrySAnuPHNxRBmPZ BuX0AI1TAzJ7beKE+vkZqGFJZQaIWv1anOgzw0X0pUxt8d5kZyCE82MKjb/7l/5WyDtw WAyjMy/+mZMVvYhd82JGyL92/EmQu44hgoz8DmA//NOWwSgK/n2fU0d/xEDOXj4zuSuO usLw== ARC-Authentication-Results: i=1; mx.google.com; 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 n1-v6si12079491pge.263.2018.07.01.09.21.54; Sun, 01 Jul 2018 09:22:08 -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; 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 S964972AbeGAQTg (ORCPT + 99 others); Sun, 1 Jul 2018 12:19:36 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33222 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933589AbeGAQTd (ORCPT ); Sun, 1 Jul 2018 12:19:33 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 5D0B149B; Sun, 1 Jul 2018 16:19:32 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Bo , David Sterba , Sudip Mukherjee Subject: [PATCH 4.4 100/105] Btrfs: fix unexpected cow in run_delalloc_nocow Date: Sun, 1 Jul 2018 18:02:50 +0200 Message-Id: <20180701153156.649531319@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180701153149.382300170@linuxfoundation.org> References: <20180701153149.382300170@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu Bo commit 5811375325420052fcadd944792a416a43072b7f upstream. Fstests generic/475 provides a way to fail metadata reads while checking if checksum exists for the inode inside run_delalloc_nocow(), and csum_exist_in_range() interprets error (-EIO) as inode having checksum and makes its caller enter the cow path. In case of free space inode, this ends up with a warning in cow_file_range(). The same problem applies to btrfs_cross_ref_exist() since it may also read metadata in between. With this, run_delalloc_nocow() bails out when errors occur at the two places. cc: v2.6.28+ Fixes: 17d217fe970d ("Btrfs: fix nodatasum handling in balancing code") Signed-off-by: Liu Bo Signed-off-by: David Sterba Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1202,6 +1202,8 @@ static noinline int csum_exist_in_range( list_del(&sums->list); kfree(sums); } + if (ret < 0) + return ret; return 1; } @@ -1351,10 +1353,23 @@ next_slot: goto out_check; if (btrfs_extent_readonly(root, disk_bytenr)) goto out_check; - if (btrfs_cross_ref_exist(trans, root, ino, + ret = btrfs_cross_ref_exist(trans, root, ino, found_key.offset - - extent_offset, disk_bytenr)) + extent_offset, disk_bytenr); + if (ret) { + /* + * ret could be -EIO if the above fails to read + * metadata. + */ + if (ret < 0) { + if (cow_start != (u64)-1) + cur_offset = cow_start; + goto error; + } + + WARN_ON_ONCE(nolock); goto out_check; + } disk_bytenr += extent_offset; disk_bytenr += cur_offset - found_key.offset; num_bytes = min(end + 1, extent_end) - cur_offset; @@ -1372,8 +1387,20 @@ next_slot: * this ensure that csum for a given extent are * either valid or do not exist. */ - if (csum_exist_in_range(root, disk_bytenr, num_bytes)) + ret = csum_exist_in_range(root, disk_bytenr, num_bytes); + if (ret) { + /* + * ret could be -EIO if the above fails to read + * metadata. + */ + if (ret < 0) { + if (cow_start != (u64)-1) + cur_offset = cow_start; + goto error; + } + WARN_ON_ONCE(nolock); goto out_check; + } nocow = 1; } else if (extent_type == BTRFS_FILE_EXTENT_INLINE) { extent_end = found_key.offset +