block: remove bogus union
authorKanchan Joshi <joshi.k@samsung.com>
Tue, 17 Sep 2024 04:54:57 +0000 (10:24 +0530)
committerJens Axboe <axboe@kernel.dk>
Tue, 17 Sep 2024 05:05:11 +0000 (23:05 -0600)
The union around bi_integrity field is pointless.
Remove it.

Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Link: https://lore.kernel.org/r/20240917045457.429698-1-joshi.k@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
include/linux/blk_types.h

index 36ed9613321755f4c7a9e3ed708c51141f1c2e46..6d3a0fff2a1d841e07688a269d49c9e74539d8d3 100644 (file)
@@ -248,11 +248,9 @@ struct bio {
        struct bio_crypt_ctx    *bi_crypt_context;
 #endif
 
-       union {
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
-               struct bio_integrity_payload *bi_integrity; /* data integrity */
+       struct bio_integrity_payload *bi_integrity; /* data integrity */
 #endif
-       };
 
        unsigned short          bi_vcnt;        /* how many bio_vec's */