diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index b633754c5d8b483709c9bb0e4880921372e1328d..b5016eb7b37323e1999c3e72765f257f018dc5f8 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -2225,8 +2225,9 @@ static int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,
 	struct ext4_xattr_search *s = &is->s;
 	int error;
 
-	if (EXT4_I(inode)->i_extra_isize == 0)
+	if (!EXT4_INODE_HAS_XATTR_SPACE(inode))
 		return -ENOSPC;
+
 	error = ext4_xattr_set_entry(i, s, handle, inode, false /* is_block */);
 	if (error)
 		return error;
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 20c9ed910ba0f929ffcd7b93bf42142d9cee30f4..bb64f2ebccfb1fa48eded5662746bf2481f046bc 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -935,7 +935,7 @@ static const struct io_op_def io_op_defs[] = {
 		.needs_file		= 1,
 		.hash_reg_file		= 1,
 		.unbound_nonreg_file	= 1,
-		.work_flags		= IO_WQ_WORK_BLKCG,
+		.work_flags		= IO_WQ_WORK_BLKCG | IO_WQ_WORK_FILES,
 	},
 	[IORING_OP_PROVIDE_BUFFERS] = {},
 	[IORING_OP_REMOVE_BUFFERS] = {},