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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 02BCFC43603 for ; Mon, 9 Dec 2019 19:38:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B75F5206E0 for ; Mon, 9 Dec 2019 19:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575920330; bh=ilWjYIZktXNjf/jL/wn1JHg24Mf9oE8ZC4sRAFWnA+M=; h=From:To:Cc:Subject:Date:List-ID:From; b=2Lp/HXylxO+YCJRUv6YT0O6jbon3ZEGia0HFz/waFJzu0TqOLkBO8YQiq3HDmSA31 19s9LIrim+JvOM3ylDEJKpeuyphLuHBnjM4+wuWkZ/qp9XICaPF2ft5h2a1RWajl3M Jo5iPXphIDdcRjwyFHExuinNulqc0v3GhOBpzgLo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726495AbfLITiu (ORCPT ); Mon, 9 Dec 2019 14:38:50 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:37012 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726342AbfLITit (ORCPT ); Mon, 9 Dec 2019 14:38:49 -0500 Received: by mail-pj1-f65.google.com with SMTP id ep17so6316108pjb.4 for ; Mon, 09 Dec 2019 11:38:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BQoqx+QQ10btEuvgKyeuNujQayQkYNEsqlTh4A9qAUQ=; b=tmoL0R03ttmI5x2vGMKcnnaeIrCoZxTeYZtzhUnf6sjHNzv5pQG4/QIidWlAqyAOd8 UvFOxOIQVSvkbOcPDzfarKMDqXTDe3eVlrl3VH5pHo7VmDeUKO5pr2hDFa3UtjFnMh3S 6RLufb8MREkSIuUQwOdrNE4RR9Qa4+Nn8ydyOOrDvxY4s8T2xWySgz6JonyAM+TPURAm YAC7FMeF31zI+NvDCOjXC2vBVe5AzUGIQGsj/ityJKXE7o83BjGADdNlx6k2LxLnRzNM VaDon3wzW277BKroXQx7T+TGy2oisVU/M2cQE1DPUvBzuidD9kkMy4evUs52YJ6w6BqR ga1g== X-Gm-Message-State: APjAAAV0DpRtIJBnXkHyop96Xb3NnUgQRGqFw+v7PEpfw2VDbHKb/7jz 89D8qf4mgL/iYrC1lFMOnxQ= X-Google-Smtp-Source: APXvYqwDdnsSCIi9TcUKZps3/93xcyj2AiOEFqf+97eJmA7kMIRzSF444KAngjK1pMJiip4fyr2VCA== X-Received: by 2002:a17:902:aa8f:: with SMTP id d15mr28782768plr.276.1575920329056; Mon, 09 Dec 2019 11:38:49 -0800 (PST) Received: from dennisz-mbp.thefacebook.com ([199.201.64.138]) by smtp.gmail.com with ESMTPSA id q11sm265359pff.111.2019.12.09.11.38.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Dec 2019 11:38:48 -0800 (PST) From: Dennis Zhou To: David Sterba , Chris Mason , Josef Bacik , Omar Sandoval , Nikolay Borisov Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org, Dennis Zhou Subject: [PATCH] btrfs: discard before adding to the free space cache Date: Mon, 9 Dec 2019 11:38:46 -0800 Message-Id: <20191209193846.18162-1-dennis@kernel.org> X-Mailer: git-send-email 2.13.5 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Returning free space to the free space cache lets it immediately be reused. So discard before returning the free space otherwise we can race here. Fixes: 55e734b728c0 ("btrfs: Don't discard unwritten extents") Cc: Nikolay Borisov Cc: Omar Sandoval Signed-off-by: Dennis Zhou --- fs/btrfs/inode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 625439875299..1ab13943cdf0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3250,13 +3250,14 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) clear_reserved_extent && !test_bit(BTRFS_ORDERED_NOCOW, &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); + + btrfs_free_reserved_extent(fs_info, + ordered_extent->start, + ordered_extent->disk_len, 1); } } -- 2.17.1