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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 5B45DC3A59E for ; Mon, 2 Sep 2019 22:49:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3027E21670 for ; Mon, 2 Sep 2019 22:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727758AbfIBWt5 (ORCPT ); Mon, 2 Sep 2019 18:49:57 -0400 Received: from mail104.syd.optusnet.com.au ([211.29.132.246]:32804 "EHLO mail104.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727551AbfIBWt5 (ORCPT ); Mon, 2 Sep 2019 18:49:57 -0400 Received: from dread.disaster.area (pa49-181-255-194.pa.nsw.optusnet.com.au [49.181.255.194]) by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id 95C9543C8E4; Tue, 3 Sep 2019 08:49:54 +1000 (AEST) Received: from dave by dread.disaster.area with local (Exim 4.92) (envelope-from ) id 1i4v8y-0003eb-W4; Tue, 03 Sep 2019 08:49:53 +1000 Date: Tue, 3 Sep 2019 08:49:52 +1000 From: Dave Chinner To: "Darrick J. Wong" Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org Subject: Re: [PATCH 1/9] libxfs: revert FSGEOMETRY v5 -> v4 hack Message-ID: <20190902224952.GU1119@dread.disaster.area> References: <156713882070.386621.8501281965010809034.stgit@magnolia> <156713882716.386621.4791011879331220967.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <156713882716.386621.4791011879331220967.stgit@magnolia> User-Agent: Mutt/1.10.1 (2018-07-13) X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=D+Q3ErZj c=1 sm=1 tr=0 a=YO9NNpcXwc8z/SaoS+iAiA==:117 a=YO9NNpcXwc8z/SaoS+iAiA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=J70Eh1EUuV4A:10 a=yPCof4ZbAAAA:8 a=20KFwNOVAAAA:8 a=7-415B0cAAAA:8 a=HE-v-iXcJJ3OLVGz9-gA:9 a=CjuIK1q_8ugA:10 a=biEYGPWJfzWAr4FL6Ov7:22 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Aug 29, 2019 at 09:20:27PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong > > Revert the #define redirection of XFS_IOC_FSGEOMETRY to the old V4 > ioctl. > > Signed-off-by: Darrick J. Wong > --- > libxfs/xfs_fs.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > > diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h > index 67fceffc..31ac6323 100644 > --- a/libxfs/xfs_fs.h > +++ b/libxfs/xfs_fs.h > @@ -822,9 +822,7 @@ struct xfs_scrub_metadata { > #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq) > #define XFS_IOC_FSGEOMETRY_V4 _IOR ('X', 124, struct xfs_fsop_geom_v4) > #define XFS_IOC_GOINGDOWN _IOR ('X', 125, uint32_t) > -/* For compatibility, for now */ > -/* #define XFS_IOC_FSGEOMETRY _IOR ('X', 126, struct xfs_fsop_geom_v5) */ > -#define XFS_IOC_FSGEOMETRY XFS_IOC_FSGEOMETRY_V4 > +#define XFS_IOC_FSGEOMETRY _IOR ('X', 126, struct xfs_fsop_geom) > #define XFS_IOC_BULKSTAT _IOR ('X', 127, struct xfs_bulkstat_req) > #define XFS_IOC_INUMBERS _IOR ('X', 128, struct xfs_inumbers_req) Looks fine, but can we change the order of this patch in the series until after all the geometry callers have been converted to use the common function with fallback from v5 to v4 calls? Reviewed-by: Dave Chinner -- Dave Chinner david@fromorbit.com