From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Jan 2025 18:16:45 +0000 (-0800)
Subject: Merge tag 'for-6.13-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v6.13-rc7~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=643e2e259c2b25a2af0ae4c23c6e16586d9fd19c;p=thirdparty%2Flinux.git

Merge tag 'for-6.13-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "A few more fixes.

  Besides the one-liners in Btrfs there's fix to the io_uring and
  encoded read integration (added in this development cycle). The update
  to io_uring provides more space for the ongoing command that is then
  used in Btrfs to handle some cases.

   - io_uring and encoded read:
       - provide stable storage for io_uring command data
       - make a copy of encoded read ioctl call, reuse that in case the
         call would block and will be called again

   - properly initialize zlib context for hardware compression on s390

   - fix max extent size calculation on filesystems with non-zoned
     devices

   - fix crash in scrub on crafted image due to invalid extent tree"

* tag 'for-6.13-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: zlib: fix avail_in bytes for s390 zlib HW compression path
  btrfs: zoned: calculate max_extent_size properly on non-zoned setup
  btrfs: avoid NULL pointer dereference if no valid extent tree
  btrfs: don't read from userspace twice in btrfs_uring_encoded_read()
  io_uring: add io_uring_cmd_get_async_data helper
  io_uring/cmd: add per-op data to struct io_uring_cmd_data
  io_uring/cmd: rename struct uring_cache to io_uring_cmd_data
---

643e2e259c2b25a2af0ae4c23c6e16586d9fd19c
diff --cc include/linux/io_uring/cmd.h
index 0d5448c0b86cd,b0aeec834c1db..a3ce553413de8
--- a/include/linux/io_uring/cmd.h
+++ b/include/linux/io_uring/cmd.h
@@@ -110,7 -115,12 +115,12 @@@ static inline void io_uring_cmd_complet
  
  static inline struct task_struct *io_uring_cmd_get_task(struct io_uring_cmd *cmd)
  {
 -	return cmd_to_io_kiocb(cmd)->task;
 +	return cmd_to_io_kiocb(cmd)->tctx->task;
  }
  
+ static inline struct io_uring_cmd_data *io_uring_cmd_get_async_data(struct io_uring_cmd *cmd)
+ {
+ 	return cmd_to_io_kiocb(cmd)->async_data;
+ }
+ 
  #endif /* _LINUX_IO_URING_CMD_H */