summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKanchan Joshi <joshi.k@samsung.com>2024-09-17 10:24:57 +0530
committerJens Axboe <axboe@kernel.dk>2024-09-16 23:05:11 -0600
commit4208c562a27899212e8046080555e0f204e0579a (patch)
treeac4ec832b2fbe2ad6baa3678a7f59b4e17094bdb
parentaa3d8a36780ab568d528348dd8115560f63ea16b (diff)
block: remove bogus union
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>
-rw-r--r--include/linux/blk_types.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 36ed96133217..6d3a0fff2a1d 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -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 */