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 A68A2C4BA24 for ; Wed, 26 Feb 2020 20:25:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AE3E20714 for ; Wed, 26 Feb 2020 20:25:52 +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="WxfUUuca" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727491AbgBZUZw (ORCPT ); Wed, 26 Feb 2020 15:25:52 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:35226 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727260AbgBZUZv (ORCPT ); Wed, 26 Feb 2020 15:25:51 -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=LGJvlzxGstVcsVqi9u03PzLBgZ646yFh6Y5ZbWgkwtI=; b=WxfUUucafMSpYAFmUavaKqag6t u5mTPU+sLlddPv5obK8WXn55ZerdE4Zg5BlGeCPynUkwNzcae8uiRrgZiMsQZd4VcBc9AoeHKieUM DZgZWR6GpFRvVbZeeAifacL8x0VoffjqU377GQjwMwmfKlS+3jptNk7qxejISCrmwmnnu+BqKaYqk i3SSxfNH9Of956y1nEsbSjQ2WyjH8g5Kjvfu2EY19NKQMBDcvjneG7nVNKbmes2BXNS+BpZIdasRQ IDBEcQHJcJOL0dLJLKnxtDnw5fz1JbKMnsbL74DJCG4cS8Fxo8tfvO2WMlxxdeJ1weB4tq7mxDIe7 xcVOJeyQ==; Received: from [199.255.44.128] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1j73Ff-0001Ob-Fy; Wed, 26 Feb 2020 20:25:51 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: Dave Chinner , "Darrick J . Wong" Subject: [PATCH 30/32] xfs: clean up bufsize alignment in xfs_ioc_attr_list Date: Wed, 26 Feb 2020 12:23:04 -0800 Message-Id: <20200226202306.871241-31-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 Use the round_down macro, and use the size of the uint32 type we use in the callback that fills the buffer to make the code a little more clear - the size of it is always the same as int for platforms that Linux runs on. Suggested-by: Dave Chinner Reviewed-by: Dave Chinner Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 58fd2d219972..c805fdf4ea39 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -415,7 +415,7 @@ xfs_ioc_attr_list( context.resynch = 1; context.attr_filter = xfs_attr_filter(flags); context.buffer = buffer; - context.bufsize = (bufsize & ~(sizeof(int)-1)); /* align */ + context.bufsize = round_down(bufsize, sizeof(uint32_t)); context.firstu = context.bufsize; context.put_listent = xfs_ioc_attr_put_listent; -- 2.24.1