[PATCH] Include: block: blk_types: Removed unneeded union from bio struct

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



In include/linux/blk_types.h a nameless, single member
union exists within the bio struct.  It seems to be left
over from earlier, edited patches added in 3.18.  Cleaned
up by removing the union and the tab given to its contents.

Signed-off-by: John Pittman <jpittman@xxxxxxxxxx>
---
 include/linux/blk_types.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 436f43f..972ace4 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -61,11 +61,10 @@ struct bio {
 	struct io_context	*bi_ioc;
 	struct cgroup_subsys_state *bi_css;
 #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 */
 
-- 
2.5.5

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux