btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()
Subsystems (2)
PATCH 1/1 btrfs: add struct io_btrfs_cmd as type for io_uring_cmd_to_pdu()
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 <[email protected]>
Suggested-by Pavel Begunkov <[email protected]>
--- fs/btrfs/ioctl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +8 -2
@@ -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 issvoid 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); }
Signature · 1 line
2.45.2
Quoted 2 lines · Mark Harmstone
Add struct
io_btrfs_cmdas a wrapper type forio_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.
Signature · 1 line
Pavel Begunkov
Quoted 5 lines · Mark Harmstone
Add struct
io_btrfs_cmdas a wrapper type forio_uring_cmd_to_pdu(), rather than using a raw pointer.Signed-off-by Mark Harmstone <[email protected]>Suggested-by Pavel Begunkov <[email protected]>
Added to for-next to the other io_uring patches, thanks.