Message ID | 20210308122719.476611287@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=Q14i=IG=vger.kernel.org=stable-owner@kernel.org> 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 9832AC4332D for <stable@archiver.kernel.org>; Mon, 8 Mar 2021 12:36:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59BF6651D3 for <stable@archiver.kernel.org>; Mon, 8 Mar 2021 12:36:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231388AbhCHMg0 (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 8 Mar 2021 07:36:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:45774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232229AbhCHMgH (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 8 Mar 2021 07:36:07 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 572AD651DC; Mon, 8 Mar 2021 12:36:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615206966; bh=n1SeZU+xi7BdhXDbw1R79gzHie++Yhbpv16r+038UvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EVAz42ceQYje5/dvMyfM7RIduvftmQX813AR+SwGp/fUFqS9vec923u05ZMM8zHib yXd1eQUfVqTQtWmto166jb8N9TMhp2lyZ/nXOCmA5zR/JqAl8INYLHothfTs6yda6k 1aporYW4lP9j2RYkIDR/cYrh2SBIHyzUjl2iz6wI= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Qu Wenruo <wqu@suse.com>, Nikolay Borisov <nborisov@suse.com>, David Sterba <dsterba@suse.com> Subject: [PATCH 5.11 18/44] btrfs: unlock extents in btrfs_zero_range in case of quota reservation errors Date: Mon, 8 Mar 2021 13:34:56 +0100 Message-Id: <20210308122719.476611287@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210308122718.586629218@linuxfoundation.org> References: <20210308122718.586629218@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -3264,8 +3264,11 @@ reserve_space: goto out; ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), &data_reserved, alloc_start, bytes_to_reserve); - if (ret) + if (ret) { + unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, + lockend, &cached_state); goto out; + } ret = btrfs_prealloc_file_range(inode, mode, alloc_start, alloc_end - alloc_start, i_blocksize(inode),