diff mbox series

[1/2] Revert "ext4: drop duplicate ea_inode handling in ext4_xattr_block_set()"

Message ID 20240321162657.27420-1-jack@suse.cz
State Awaiting Upstream
Headers show
Series [1/2] Revert "ext4: drop duplicate ea_inode handling in ext4_xattr_block_set()" | expand

Commit Message

Jan Kara March 21, 2024, 4:26 p.m. UTC 
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>
---
 fs/ext4/xattr.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Theodore Ts'o May 3, 2024, 4:02 a.m. UTC | #1 
On Thu, Mar 21, 2024 at 05:26:49PM +0100, Jan Kara wrote:
> 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>

Applied, thanks.

					- Ted
diff mbox series

Patch

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 @@  ext4_xattr_block_set(handle_t *handle, struct inode *inode,
 						      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,