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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 5446DC4BA21 for ; Wed, 26 Feb 2020 20:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C85F2072D for ; Wed, 26 Feb 2020 20:24:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="rby976tf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727277AbgBZUYx (ORCPT ); Wed, 26 Feb 2020 15:24:53 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:35054 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727260AbgBZUYx (ORCPT ); Wed, 26 Feb 2020 15:24:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=WmXuZZgk3kCaGRRy2ecKBtSMTzmR6jbG/NC1ZfjKaY8=; b=rby976tfz8qA59K8tr58sA7l7Y b5BtknflWoueUQgsmhVbgGVC2TZMDc+EPBMPJotOi6jSw1aPNAh6zPflt7JfTWoRVvVS2mpl2xOJO bJ8y0UW/B68+6VE8ucdFBhfEKp8Mg0yFPyhDLmBpEqRJy4Nw/g0EjbG14JosBYDOpGGRnlBAuxlIK hDDLNFii4kHoTPO20Z4JwESZnlanzGZSe0OP4OVb4SA74WPpQss62ToRaPMmeFeMrnsBl7xvLrDTD lggr3EOmeVUwrlzT3nea+zLWJAndlneETyulLgCrbqe86pjFqq0rvIAJ/5WjffXp2fclsNWxKxani qgWe08WA==; Received: from [199.255.44.128] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1j73Ej-0008V9-9t; Wed, 26 Feb 2020 20:24:53 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: Dave Chinner , Chandan Rajendra , "Darrick J . Wong" Subject: [PATCH 19/32] xfs: open code ATTR_ENTSIZE Date: Wed, 26 Feb 2020 12:22:53 -0800 Message-Id: <20200226202306.871241-20-hch@lst.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200226202306.871241-1-hch@lst.de> References: <20200226202306.871241-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Replace a single use macro containing open-coded variants of standard helpers with direct calls to the standard helpers. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Chandan Rajendra Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_attr_list.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c index 0fe12474a952..c97e6806cf1f 100644 --- a/fs/xfs/xfs_attr_list.c +++ b/fs/xfs/xfs_attr_list.c @@ -545,12 +545,6 @@ 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) \ - & ~(sizeof(uint32_t)-1)) - /* * Format an attribute and copy it out to the user's buffer. * Take care to check values and protect against them changing later, @@ -586,7 +580,10 @@ xfs_attr_put_listent( arraytop = sizeof(*alist) + context->count * sizeof(alist->al_offset[0]); - context->firstu -= ATTR_ENTSIZE(namelen); + + /* decrement by the actual bytes used by the attr */ + context->firstu -= round_up(offsetof(struct attrlist_ent, a_name) + + namelen + 1, sizeof(uint32_t)); if (context->firstu < arraytop) { trace_xfs_attr_list_full(context); alist->al_more = 1; -- 2.24.1