diff mbox series

[23/33] xfs: replace ATTR_ENTBASESIZE with offsetoff

Message ID	20191212105433.1692-24-hch@lst.de (mailing list archive)
State	Superseded
Headers	show Return-Path: <SRS0=0MSb=2C=vger.kernel.org=linux-xfs-owner@kernel.org> From: Christoph Hellwig <hch@lst.de> To: linux-xfs@vger.kernel.org Cc: Allison Collins <allison.henderson@oracle.com> Subject: [PATCH 23/33] xfs: replace ATTR_ENTBASESIZE with offsetoff Date: Thu, 12 Dec 2019 11:54:23 +0100 Message-Id: <20191212105433.1692-24-hch@lst.de> In-Reply-To: <20191212105433.1692-1-hch@lst.de> References: <20191212105433.1692-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	[01/33] xfs: clear kernel only flags in XFS_IOC_ATTRMULTI_BY_HANDLE \| expand [01/33] xfs: clear kernel only flags in XFS_IOC_ATTRMULTI_BY_HANDLE [02/33] xfs: reject invalid flags combinations in XFS_IOC_ATTRMULTI_BY_HANDLE [03/33] xfs: also remove cached ACLs when removing the underlying attr [04/33] xfs: fix misuse of the XFS_ATTR_INCOMPLETE flag [05/33] xfs: remove the ATTR_INCOMPLETE flag [06/33] xfs: merge xfs_attr_remove into xfs_attr_set [07/33] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set [08/33] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE [09/33] xfs: factour out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op [10/33] xfs: remove the name == NULL check from xfs_attr_args_init [11/33] xfs: remove the MAXNAMELEN check from xfs_attr_args_init [12/33] xfs: move struct xfs_da_args to xfs_types.h [13/33] xfs: turn xfs_da_args.value into a void pointer [14/33] xfs: pass an initialized xfs_da_args structure to xfs_attr_set [15/33] xfs: pass an initialized xfs_da_args to xfs_attr_get [16/33] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked [17/33] xfs: remove ATTR_KERNOVAL [18/33] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL [19/33] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME [20/33] xfs: factor out a xfs_attr_match helper [21/33] xfs: cleanup xfs_attr_list_context [22/33] xfs: remove the unused ATTR_ENTRY macro [23/33] xfs: replace ATTR_ENTBASESIZE with offsetoff [24/33] xfs: move the legacy xfs_attr_list to xfs_ioctl.c [25/33] xfs: rename xfs_attr_list_int to xfs_attr_list [26/33] xfs: lift common check into xfs_ioc_attr_list [27/33] xfs: lift buffer allocation into xfs_ioc_attr_list [28/33] xfs: lift cursor copy in/out into xfs_ioc_attr_list [29/33] xfs: improve xfs_forget_acl [30/33] xfs: clean up the ATTR_REPLACE checks [31/33] xfs: clean up the attr flag confusion [32/33] xfs: remove XFS_DA_OP_INCOMPLETE [33/33] xfs: embedded the attrlist cursor into struct xfs_attr_list_context

Commit Message

Christoph Hellwig Dec. 12, 2019, 10:54 a.m. UTC

Replace an opencoded offsetof with the actual helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs_attr_list.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 9c4acb6dc856..7f08e417d131 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -545,10 +545,9 @@  xfs_attr_list_int(
 	return error;
 }
 
-#define	ATTR_ENTBASESIZE		/* minimum bytes used by an attr */ \
-	(((struct attrlist_ent *) 0)->a_name - (char *) 0)
 #define	ATTR_ENTSIZE(namelen)		/* actual bytes used by an attr */ \
-	((ATTR_ENTBASESIZE + (namelen) + 1 + sizeof(uint32_t)-1) \
+	((offsetof(struct attrlist_ent, a_name) + \
+	 (namelen) + 1 + sizeof(uint32_t) - 1) \
 	 & ~(sizeof(uint32_t)-1))
 
 /*