[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: e2118b3c3d94289852417f70ec128c25f4833aad
WARNING: Author mismatch between patch and upstream commit: Backport author: Shivani Agarwal shivani.agarwal@broadcom.com Commit author: Damien Le Moal damien.lemoal@wdc.com
Status in newer kernel trees: 6.15.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1) 5.15.y | Present (exact SHA1)
Note: The patch differs from the upstream commit: --- 1: e2118b3c3d94 ! 1: e83906552e29 dm: rearrange core declarations for extended use from dm-zone.c @@ Metadata ## Commit message ## dm: rearrange core declarations for extended use from dm-zone.c
+ commit e2118b3c3d94289852417f70ec128c25f4833aad upstream. + Move the definitions of struct dm_target_io, struct dm_io and the bits of the flags field of struct mapped_device from dm.c to dm-core.h to make them usable from dm-zone.c. For the same reason, declare @@ Commit message Reviewed-by: Hannes Reinecke hare@suse.de Reviewed-by: Himanshu Madhani himanshu.madhani@oracle.com Signed-off-by: Mike Snitzer snitzer@redhat.com + [Shivani: Modified to apply on 5.10.y] + Signed-off-by: Shivani Agarwal shivani.agarwal@broadcom.com
## drivers/md/dm-core.h ## @@ drivers/md/dm-core.h: struct mapped_device { @@ drivers/md/dm-core.h: struct mapped_device { void disable_write_same(struct mapped_device *md); void disable_write_zeroes(struct mapped_device *md); @@ drivers/md/dm-core.h: struct dm_table { - #endif + struct dm_md_mempools *mempools; };
+/* @@ drivers/md/dm.c: struct clone_info { - struct dm_target_io tio; -}; - - #define DM_TARGET_IO_BIO_OFFSET (offsetof(struct dm_target_io, clone)) - #define DM_IO_BIO_OFFSET \ - (offsetof(struct dm_target_io, clone) + offsetof(struct dm_io, tio)) + void *dm_per_bio_data(struct bio *bio, size_t data_size) + { + struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); @@ drivers/md/dm.c: EXPORT_SYMBOL_GPL(dm_bio_get_target_bio_nr);
#define MINOR_ALLOCED ((void *)-1)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | origin/linux-5.10.y | Success | Success |