[5.4,26/27] btrfs: export and rename qgroup_reserve_meta

Message ID	20210813150524.252016242@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>, David Sterba <dsterba@suse.com>, Anand Jain <anand.jain@oracle.com> Subject: [PATCH 5.4 26/27] btrfs: export and rename qgroup_reserve_meta Date: Fri, 13 Aug 2021 17:07:24 +0200 Message-Id: <20210813150524.252016242@linuxfoundation.org> In-Reply-To: <20210813150523.364549385@linuxfoundation.org> References: <20210813150523.364549385@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/27] tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag [5.4,03/27] media: v4l2-mem2mem: always consider OUTPUT queue during poll [5.4,04/27] tracing: Reject string operand in the histogram expression [5.4,05/27] usb: dwc3: Stop active transfers before halting the controller [5.4,06/27] usb: dwc3: gadget: Allow runtime suspend if UDC unbinded [5.4,07/27] usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup [5.4,08/27] usb: dwc3: gadget: Prevent EP queuing while stopping transfers [5.4,09/27] usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable [5.4,10/27] usb: dwc3: gadget: Disable gadget IRQ during pullup disable [5.4,11/27] usb: dwc3: gadget: Avoid runtime resume if disabling pullup [5.4,12/27] KVM: X86: MMU: Use the correct inherited permissions to get shadow page [5.4,13/27] USB:ehci:fix Kunpeng920 ehci hardware problem [5.4,14/27] ALSA: hda: Add quirk for ASUS Flow x13 [5.4,15/27] ppp: Fix generating ppp unit id when ifname is not specified [5.4,16/27] ovl: prevent private clone if bind mount is not allowed [5.4,17/27] btrfs: make qgroup_free_reserved_data take btrfs_inode [5.4,18/27] btrfs: make btrfs_qgroup_reserve_data take btrfs_inode [5.4,19/27] btrfs: qgroup: allow to unreserve range without releasing other ranges [5.4,20/27] btrfs: qgroup: try to flush qgroup space when we get -EDQUOT [5.4,21/27] btrfs: transaction: Cleanup unused TRANS_STATE_BLOCKED [5.4,22/27] btrfs: qgroup: remove ASYNC_COMMIT mechanism in favor of reserve retry-after-EDQUOT [5.4,23/27] btrfs: fix lockdep splat when enabling and disabling qgroups [5.4,24/27] net: xilinx_emaclite: Do not print real IOMEM pointer [5.4,25/27] btrfs: qgroup: dont commit transaction when we already hold the handle [5.4,26/27] btrfs: export and rename qgroup_reserve_meta [5.4,27/27] btrfs: dont flush from btrfs_delayed_inode_reserve_metadata

Message ID

20210813150524.252016242@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>,
	David Sterba <dsterba@suse.com>, Anand Jain <anand.jain@oracle.com>
Subject: [PATCH 5.4 26/27] btrfs: export and rename qgroup_reserve_meta
Date: Fri, 13 Aug 2021 17:07:24 +0200
Message-Id: <20210813150524.252016242@linuxfoundation.org>
In-Reply-To: <20210813150523.364549385@linuxfoundation.org>
References: <20210813150523.364549385@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Aug. 13, 2021, 3:07 p.m. UTC

From: Nikolay Borisov <nborisov@suse.com>

commit 80e9baed722c853056e0c5374f51524593cb1031 upstream

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 fs/btrfs/qgroup.c |    8 ++++----
 fs/btrfs/qgroup.h |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -3800,8 +3800,8 @@  static int sub_root_meta_rsv(struct btrf
 	return num_bytes;
 }
 
-static int qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
-				enum btrfs_qgroup_rsv_type type, bool enforce)
+int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
+			      enum btrfs_qgroup_rsv_type type, bool enforce)
 {
 	struct btrfs_fs_info *fs_info = root->fs_info;
 	int ret;
@@ -3832,14 +3832,14 @@  int __btrfs_qgroup_reserve_meta(struct b
 {
 	int ret;
 
-	ret = qgroup_reserve_meta(root, num_bytes, type, enforce);
+	ret = btrfs_qgroup_reserve_meta(root, num_bytes, type, enforce);
 	if (ret <= 0 && ret != -EDQUOT)
 		return ret;
 
 	ret = try_flush_qgroup(root);
 	if (ret < 0)
 		return ret;
-	return qgroup_reserve_meta(root, num_bytes, type, enforce);
+	return btrfs_qgroup_reserve_meta(root, num_bytes, type, enforce);
 }
 
 void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -349,7 +349,8 @@  int btrfs_qgroup_reserve_data(struct btr
 int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);
 int btrfs_qgroup_free_data(struct inode *inode,
 			struct extent_changeset *reserved, u64 start, u64 len);
-
+int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
+			      enum btrfs_qgroup_rsv_type type, bool enforce);
 int __btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
 				enum btrfs_qgroup_rsv_type type, bool enforce);
 /* Reserve metadata space for pertrans and prealloc type */

[5.4,26/27] btrfs: export and rename qgroup_reserve_meta

Commit Message

Patch