Merge tag 'for-5.19/io_uring-xattr-2022-05-22' of git://git.kernel.dk/linux-block

Pull io_uring xattr support from Jens Axboe:
 "Support for the xattr variants"

* tag 'for-5.19/io_uring-xattr-2022-05-22' of git://git.kernel.dk/linux-block:
  io_uring: cleanup error-handling around io_req_complete
  io_uring: fix trace for reduced sqe padding
  io_uring: add fgetxattr and getxattr support
  io_uring: add fsetxattr and setxattr support
  fs: split off do_getxattr from getxattr
  fs: split off setxattr_copy and do_setxattr function from setxattr

diff --cc fs/io_uring.c
index 0c6a1427618662cd6f20290251bec49c953b3bb5,fdd497f92a6eceafe94f7f52c89fe6502b51a26c..e4c9f776919b5465d8ccc54a34cd7dcbb374f164
--- 1/fs/io_uring.c
--- 2/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -1279,8 -1218,15 +1287,16 @@@ static const struct io_op_def io_op_def
        [IORING_OP_LINKAT] = {},
        [IORING_OP_MSG_RING] = {
                .needs_file             = 1,
 +              .iopoll                 = 1,
        },
+       [IORING_OP_FSETXATTR] = {
+               .needs_file = 1
+       },
+       [IORING_OP_SETXATTR] = {},
+       [IORING_OP_FGETXATTR] = {
+               .needs_file = 1
+       },
+       [IORING_OP_GETXATTR] = {},
  };
  
  /* requests with any of those set should undergo io_disarm_next() */

diff --cc include/trace/events/io_uring.h
Simple merge

diff --cc include/uapi/linux/io_uring.h
index ddf969ae5a79ab16d8c8a33bf85a15630bc2557c,8ca1d9ae56d69ec35aa41d442b118542fe88ecde..199bbf73a7527452a3c367070a96629759b1e6f5
--- 1/include/uapi/linux/io_uring.h
--- 2/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@@ -60,18 -61,10 +61,19 @@@ struct io_uring_sqe 
                __s32   splice_fd_in;
                __u32   file_index;
        };
-       __u64   __pad2[2];
+       __u64   addr3;
+       __u64   __pad2[1];
  };
  
 +/*
 + * If sqe->file_index is set to this for opcodes that instantiate a new
 + * direct descriptor (like openat/openat2/accept), then io_uring will allocate
 + * an available direct descriptor instead of having the application pass one
 + * in. The picked direct descriptor will be returned in cqe->res, or -ENFILE
 + * if the space is full.
 + */
 +#define IORING_FILE_INDEX_ALLOC               (~0U)
 +
  enum {
        IOSQE_FIXED_FILE_BIT,
        IOSQE_IO_DRAIN_BIT,