[PATCH] btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()

[PATCH] btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()

[Mark Harmstone]

Add struct io_btrfs_cmd as a wrapper type for io_uring_cmd_to_pdu(),
rather than using a raw pointer.

Signed-off-by: Mark Harmstone <maharmstone@fb.com>
Suggested-by: Pavel Begunkov <asml.silence@gmail.com>
---
 fs/btrfs/ioctl.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index cf63264a3a60..27a9342cd91c 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4740,9 +4740,14 @@ struct btrfs_uring_priv {
 	bool compressed;
 };
 
+struct io_btrfs_cmd {
+	struct btrfs_uring_priv *priv;
+};
+
 static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned int issue_flags)
 {
-	struct btrfs_uring_priv *priv = *io_uring_cmd_to_pdu(cmd, struct btrfs_uring_priv *);
+	struct io_btrfs_cmd *bc = io_uring_cmd_to_pdu(cmd, struct io_btrfs_cmd);
+	struct btrfs_uring_priv *priv = bc->priv;
 	struct btrfs_inode *inode = BTRFS_I(file_inode(priv->iocb.ki_filp));
 	struct extent_io_tree *io_tree = &inode->io_tree;
 	unsigned long index;
@@ -4796,10 +4801,11 @@ static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned int iss
 void btrfs_uring_read_extent_endio(void *ctx, int err)
 {
 	struct btrfs_uring_priv *priv = ctx;
+	struct io_btrfs_cmd *bc = io_uring_cmd_to_pdu(priv->cmd, struct io_btrfs_cmd);
 
 	priv->err = err;
+	bc->priv = priv;
 
-	*io_uring_cmd_to_pdu(priv->cmd, struct btrfs_uring_priv *) = priv;
 	io_uring_cmd_complete_in_task(priv->cmd, btrfs_uring_read_finished);
 }
 
-- 
2.45.2

Re: [PATCH] btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()

[Pavel Begunkov]

On 10/31/24 16:03, Mark Harmstone wrote:
> Add struct io_btrfs_cmd as a wrapper type for io_uring_cmd_to_pdu(),
> rather than using a raw pointer.

That looks better, thanks. I don't think your patches got
merged yet, so you'd need to send it together with the next
version of your patchset, or even better squash it into the
patch 5/5.

-- 
Pavel Begunkov

Re: [PATCH] btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()

[Mark Harmstone]

On 31/10/24 16:10, Pavel Begunkov wrote:
> > 
> On 10/31/24 16:03, Mark Harmstone wrote:
>> Add struct io_btrfs_cmd as a wrapper type for io_uring_cmd_to_pdu(),
>> rather than using a raw pointer.
> 
> That looks better, thanks. I don't think your patches got
> merged yet, so you'd need to send it together with the next
> version of your patchset, or even better squash it into the
> patch 5/5.
> 

Thanks Pavel. All five patches are already in 
https://github.com/btrfs/linux/commits/for-next/

Mark

Re: [PATCH] btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()

[David Sterba]

On Thu, Oct 31, 2024 at 04:03:56PM +0000, Mark Harmstone wrote:
> Add struct io_btrfs_cmd as a wrapper type for io_uring_cmd_to_pdu(),
> rather than using a raw pointer.
> 
> Signed-off-by: Mark Harmstone <maharmstone@fb.com>
> Suggested-by: Pavel Begunkov <asml.silence@gmail.com>

Added to for-next to the other io_uring patches, thanks.