From: Jan Kara <jack@suse.cz>
Date: Thu, 21 Mar 2024 16:26:49 +0000 (+0100)
Subject: Revert "ext4: drop duplicate ea_inode handling in ext4_xattr_block_set()"
X-Git-Tag: io_uring-6.10-20240523~39^2~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4f3e6db3c3719952cfef89340290e0b7b03f7cbc;p=linux-block.git

Revert "ext4: drop duplicate ea_inode handling in ext4_xattr_block_set()"

This reverts commit 7f48212678e91a057259b3e281701f7feb1ee397. We will
need the special cleanup handling once we move allocation of EA inode
outside of the buffer lock in the following patch.

Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20240321162657.27420-1-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index b67a176bfcf9..146690c10c73 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -2158,6 +2158,17 @@ getblk_failed:
 						      ENTRY(header(s->base)+1));
 			if (error)
 				goto getblk_failed;
+			if (ea_inode) {
+				/* Drop the extra ref on ea_inode. */
+				error = ext4_xattr_inode_dec_ref(handle,
+								 ea_inode);
+				if (error)
+					ext4_warning_inode(ea_inode,
+							   "dec ref error=%d",
+							   error);
+				iput(ea_inode);
+				ea_inode = NULL;
+			}
 
 			lock_buffer(new_bh);
 			error = ext4_journal_get_create_access(handle, sb,