From: Kanchan Joshi <joshi.k@samsung.com>
Date: Tue, 17 Sep 2024 04:54:57 +0000 (+0530)
Subject: block: remove bogus union
X-Git-Tag: v6.12-rc1~47^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4208c562a27899212e8046080555e0f204e0579a;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 36ed961332175..6d3a0fff2a1d8 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 */