From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Jun 2023 08:42:57 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.14.318~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71e078d8b61cb306bd9248d8cde4753f66767876;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	ext4-only-check-dquot_initialize_needed-when-debugging.patch
---

diff --git a/queue-5.4/ext4-only-check-dquot_initialize_needed-when-debugging.patch b/queue-5.4/ext4-only-check-dquot_initialize_needed-when-debugging.patch
new file mode 100644
index 00000000000..43d1442ef1a
--- /dev/null
+++ b/queue-5.4/ext4-only-check-dquot_initialize_needed-when-debugging.patch
@@ -0,0 +1,47 @@
+From dea9d8f7643fab07bf89a1155f1f94f37d096a5e Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Thu, 8 Jun 2023 10:06:40 -0400
+Subject: ext4: only check dquot_initialize_needed() when debugging
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit dea9d8f7643fab07bf89a1155f1f94f37d096a5e upstream.
+
+ext4_xattr_block_set() relies on its caller to call dquot_initialize()
+on the inode.  To assure that this has happened there are WARN_ON
+checks.  Unfortunately, this is subject to false positives if there is
+an antagonist thread which is flipping the file system at high rates
+between r/o and rw.  So only do the check if EXT4_XATTR_DEBUG is
+enabled.
+
+Link: https://lore.kernel.org/r/20230608044056.GA1418535@mit.edu
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/xattr.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -2016,8 +2016,9 @@ inserted:
+ 			else {
+ 				u32 ref;
+ 
++#ifdef EXT4_XATTR_DEBUG
+ 				WARN_ON_ONCE(dquot_initialize_needed(inode));
+-
++#endif
+ 				/* The old block is released after updating
+ 				   the inode. */
+ 				error = dquot_alloc_block(inode,
+@@ -2079,8 +2080,9 @@ inserted:
+ 			/* We need to allocate a new block */
+ 			ext4_fsblk_t goal, block;
+ 
++#ifdef EXT4_XATTR_DEBUG
+ 			WARN_ON_ONCE(dquot_initialize_needed(inode));
+-
++#endif
+ 			goal = ext4_group_first_block_no(sb,
+ 						EXT4_I(inode)->i_block_group);
+ 			block = ext4_new_meta_blocks(handle, inode, goal, 0,
diff --git a/queue-5.4/series b/queue-5.4/series
index 08d71b6e1ed..fc6e893b24c 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -34,3 +34,4 @@ usb-usbfs-use-consistent-mmap-functions.patch
 bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch
 i2c-sprd-delete-i2c-adapter-in-.remove-s-error-path.patch
 eeprom-at24-also-select-regmap.patch
+ext4-only-check-dquot_initialize_needed-when-debugging.patch