From patchwork Wed Apr 3 13:00:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 10883745 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 854C61800 for ; Wed, 3 Apr 2019 13:00:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70274285E1 for ; Wed, 3 Apr 2019 13:00:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 620B828984; Wed, 3 Apr 2019 13:00:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1625E285C8 for ; Wed, 3 Apr 2019 13:00:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726183AbfDCNAj (ORCPT ); Wed, 3 Apr 2019 09:00:39 -0400 Received: from mx2.suse.de ([195.135.220.15]:53636 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726151AbfDCNAj (ORCPT ); Wed, 3 Apr 2019 09:00:39 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 35512AEB0 for ; Wed, 3 Apr 2019 13:00:38 +0000 (UTC) From: Nikolay Borisov To: linux-block@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH] block: Remove redundant union declaration Date: Wed, 3 Apr 2019 16:00:35 +0300 Message-Id: <20190403130035.29024-1-nborisov@suse.com> X-Mailer: git-send-email 2.17.1 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no point in declaring bi_integrity inside a union so just remove it. Signed-off-by: Nikolay Borisov --- include/linux/blk_types.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 791fee35df88..92f576ebfc15 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -182,11 +182,9 @@ struct bio { struct blkcg_gq *bi_blkg; struct bio_issue bi_issue; #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 */