From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754556AbcHWS7R (ORCPT ); Tue, 23 Aug 2016 14:59:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38564 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292AbcHWS7Q (ORCPT ); Tue, 23 Aug 2016 14:59:16 -0400 From: John Pittman To: axboe@fb.com Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, jpittman@redhat.com Subject: [PATCH] Include: block: blk_types: Removed unneeded union from bio struct Date: Tue, 23 Aug 2016 14:59:04 -0400 Message-Id: <1471978744-6632-1-git-send-email-jpittman@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 23 Aug 2016 18:59:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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