From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE0DCC3F2CE for ; Thu, 5 Mar 2020 01:45:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CDC0214D8 for ; Thu, 5 Mar 2020 01:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725875AbgCEBpk (ORCPT ); Wed, 4 Mar 2020 20:45:40 -0500 Received: from mail105.syd.optusnet.com.au ([211.29.132.249]:33088 "EHLO mail105.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725839AbgCEBpj (ORCPT ); Wed, 4 Mar 2020 20:45:39 -0500 Received: from dread.disaster.area (pa49-195-202-68.pa.nsw.optusnet.com.au [49.195.202.68]) by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id A7D583A28D3 for ; Thu, 5 Mar 2020 12:45:38 +1100 (AEDT) Received: from discord.disaster.area ([192.168.253.110]) by dread.disaster.area with esmtp (Exim 4.92.3) (envelope-from ) id 1j9fZx-0005xN-Iv for linux-xfs@vger.kernel.org; Thu, 05 Mar 2020 12:45:37 +1100 Received: from dave by discord.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1j9fZx-0002wA-H2 for linux-xfs@vger.kernel.org; Thu, 05 Mar 2020 12:45:37 +1100 From: Dave Chinner To: linux-xfs@vger.kernel.org Subject: [PATCH 5/7] xfs: make btree cursor private union anonymous Date: Thu, 5 Mar 2020 12:45:35 +1100 Message-Id: <20200305014537.11236-6-david@fromorbit.com> X-Mailer: git-send-email 2.24.0.rc0 In-Reply-To: <20200305014537.11236-1-david@fromorbit.com> References: <20200305014537.11236-1-david@fromorbit.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.3 cv=LYdCFQXi c=1 sm=1 tr=0 a=mqTaRPt+QsUAtUurwE173Q==:117 a=mqTaRPt+QsUAtUurwE173Q==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=SS2py6AdgQ4A:10 a=20KFwNOVAAAA:8 a=kxeOMD9EKKmeiMKzHloA:9 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Dave Chinner Rename the union and it's internal structures to the new name and remove the temporary defines that facilitated the change. Signed-off-by: Dave Chinner --- fs/xfs/libxfs/xfs_btree.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h index 93063479264c..561b6c344a2c 100644 --- a/fs/xfs/libxfs/xfs_btree.h +++ b/fs/xfs/libxfs/xfs_btree.h @@ -213,7 +213,7 @@ typedef struct xfs_btree_cur struct xfs_buf *agbp; /* agf/agi buffer pointer */ xfs_agnumber_t agno; /* ag number */ union xfs_btree_cur_private priv; - } a; + } bc_ag; struct { /* needed for BMAP */ struct xfs_inode *ip; /* pointer to our inode */ int allocated; /* count of alloced */ @@ -222,10 +222,8 @@ typedef struct xfs_btree_cur char flags; /* flags */ #define XFS_BC_BT_WASDEL (1 << 0) /* was delayed */ #define XFS_BC_BT_INVALID_OWNER (1 << 1) /* for ext swap */ - } b; - } bc_private; /* per-btree type data */ -#define bc_ag bc_private.a -#define bc_bt bc_private.b + } bc_bt; + }; /* per-btree type data */ } xfs_btree_cur_t; /* cursor flags */ -- 2.24.0.rc0