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=-6.8 required=3.0 tests=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 D4F29CA9EBD for ; Sun, 27 Oct 2019 21:26:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C36A222C1 for ; Sun, 27 Oct 2019 21:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211606; bh=8zOiwY3KowzDw7wOpnwU1HLCpcB7b8/Mfnq0T6Kahf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KbaYrNWqYYMB8fWWgrZnBrxPz50WUFKe0+PWoZX9Mq3mi47SOKtCA6tA0jnIzWVjB Be9dpuy4I7/rqOlAEvtbm2mKVxIgfXOZl5TO7xJa+Nh1XYlnLx3vqTrMGNqNW8v8H8 Y1r/9q3UTBWZ59cmNbyizQ3VXXw0ZsnI5hrGhc64= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732871AbfJ0V0M (ORCPT ); Sun, 27 Oct 2019 17:26:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:48126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732270AbfJ0V0L (ORCPT ); Sun, 27 Oct 2019 17:26:11 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 9625421D80; Sun, 27 Oct 2019 21:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211571; bh=8zOiwY3KowzDw7wOpnwU1HLCpcB7b8/Mfnq0T6Kahf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rrZzmm8ZMX4J6tUg8GIhOwAN3TZHVC9sOo2/66MOJH+6/NlWOrV7RwSAT4B5BcFCa CjP4fS/A8HgRGI7uUD0lx4KuQmFRlNOIWTAmAuLI1/e+L5XjnecoWEsmXZxeProLlD iqXU3jAana0oG04Xi5Sw80Tkd/QzOT29xezx5JiE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , David Sterba Subject: [PATCH 5.3 182/197] Btrfs: add missing extents release on file extent cluster relocation error Date: Sun, 27 Oct 2019 22:01:40 +0100 Message-Id: <20191027203406.119457603@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Filipe Manana commit 44db1216efe37bf670f8d1019cdc41658d84baf5 upstream. If we error out when finding a page at relocate_file_extent_cluster(), we need to release the outstanding extents counter on the relocation inode, set by the previous call to btrfs_delalloc_reserve_metadata(), otherwise the inode's block reserve size can never decrease to zero and metadata space is leaked. Therefore add a call to btrfs_delalloc_release_extents() in case we can't find the target page. Fixes: 8b62f87bad9c ("Btrfs: rework outstanding_extents") CC: stable@vger.kernel.org # 4.19+ Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/relocation.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3276,6 +3276,8 @@ static int relocate_file_extent_cluster( if (!page) { btrfs_delalloc_release_metadata(BTRFS_I(inode), PAGE_SIZE, true); + btrfs_delalloc_release_extents(BTRFS_I(inode), + PAGE_SIZE, true); ret = -ENOMEM; goto out; }