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=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 65C27C432C0 for ; Wed, 27 Nov 2019 16:06:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48AFA2073F for ; Wed, 27 Nov 2019 16:06:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727166AbfK0QGE (ORCPT ); Wed, 27 Nov 2019 11:06:04 -0500 Received: from mx2.suse.de ([195.135.220.15]:59906 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726603AbfK0QGD (ORCPT ); Wed, 27 Nov 2019 11:06:03 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 36394AF77; Wed, 27 Nov 2019 16:06:02 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 39017DA733; Wed, 27 Nov 2019 17:06:00 +0100 (CET) Date: Wed, 27 Nov 2019 17:06:00 +0100 From: David Sterba To: Nikolay Borisov Cc: linux-btrfs@vger.kernel.org, fdmanana@suse.com Subject: Re: [PATCH 1/3] btrfs: Don't discard unwritten extents Message-ID: <20191127160600.GU2734@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Nikolay Borisov , linux-btrfs@vger.kernel.org, fdmanana@suse.com References: <20191121120331.29070-1-nborisov@suse.com> <20191121120331.29070-2-nborisov@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191121120331.29070-2-nborisov@suse.com> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Thu, Nov 21, 2019 at 02:03:29PM +0200, Nikolay Borisov wrote: > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -4169,8 +4169,6 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, > if (ret) > goto out; > } else { > - if (btrfs_test_opt(fs_info, DISCARD)) > - ret = btrfs_discard_extent(fs_info, start, len, NULL); > btrfs_add_free_space(cache, start, len); > btrfs_free_reserved_bytes(cache, len, delalloc); > trace_btrfs_reserved_extent_free(fs_info, start, len); > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 0ac0f5b33003..5d80fe030e79 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -3250,10 +3250,15 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) > if ((ret || !logical_len) && > clear_reserved_extent && > !test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) && > - !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) > + !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) { > btrfs_free_reserved_extent(fs_info, > ordered_extent->start, > ordered_extent->disk_len, 1); > + if (ret && btrfs_test_opt(fs_info, DISCARD)) > + btrfs_discard_extent(fs_info, > + ordered_extent->start, ordered_extent->disk_len, > + NULL); This brings back vague memories of misplaced discard (in finish_ordered_io), that was quite hard to catch. I can't find the fix though. Filipe, is it the same issue?