From patchwork Mon May 20 23:17:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10952561 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73B54112C for ; Mon, 20 May 2019 23:17:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60AB12015F for ; Mon, 20 May 2019 23:17:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5505B288A7; Mon, 20 May 2019 23:17:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C01822015F for ; Mon, 20 May 2019 23:17:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727077AbfETXRY (ORCPT ); Mon, 20 May 2019 19:17:24 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:37032 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726584AbfETXRY (ORCPT ); Mon, 20 May 2019 19:17:24 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4KNDnr5149858; Mon, 20 May 2019 23:17:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=1KJ2CefLVeKw/GhgCrQDcVYG7w3gjRxusiQzFTtjv7Y=; b=Q+JVig2kFXSRIaZuJpygQeMhFcSESIJTVkyDOZJdzodsX2ywxUir01/QYEmPwANA4wUa PZBBHyJD6a0BVzlxXE7akrgYSmSmN1y5dbPs/tPQbyTN7MxNIdPEfVuMN6VXn6XEhTsK 4mj2PzDPp6hPIolYSmFwZ6R0VPx0CBf1HZZ467CfZyRTMDHqvayoTwsSqYXDsibV3WsU 6g/gvL+ORQ5VANfgiVoiBTueq+RjdYMZdqIowe0sRUlH2Zdc4CnGwkZr6Y14MqZ0pwCl z21HhzZHaWN7D77lhaKQg9xQ61oQWSMKav0jhspIyUTGBmPXgXE4rFUwbY12d0sODoq+ Qw== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 2sj7jdj5kg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2019 23:17:21 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4KNGopW074313; Mon, 20 May 2019 23:17:20 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3030.oracle.com with ESMTP id 2skudb28fk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2019 23:17:20 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x4KNHKLU022060; Mon, 20 May 2019 23:17:20 GMT Received: from localhost (/10.159.247.197) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 20 May 2019 23:17:19 +0000 Subject: [PATCH 06/12] misc: remove all use of xfs_fsop_geom_t From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Mon, 20 May 2019 16:17:19 -0700 Message-ID: <155839423901.68606.18360420363137361199.stgit@magnolia> In-Reply-To: <155839420081.68606.4573219764134939943.stgit@magnolia> References: <155839420081.68606.4573219764134939943.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9263 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905200142 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9263 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905200142 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Remove all the uses of the old xfs_fsop_geom_t typedef. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen --- growfs/xfs_growfs.c | 4 ++-- io/init.c | 2 +- io/io.h | 6 +++--- io/open.c | 6 +++--- man/man3/xfsctl.3 | 2 +- spaceman/file.c | 4 ++-- spaceman/init.c | 2 +- spaceman/space.h | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index 392e4a00..ffd82f95 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -44,7 +44,7 @@ main(int argc, char **argv) int error; /* we have hit an error */ long esize; /* new rt extent size */ int ffd; /* mount point file descriptor */ - xfs_fsop_geom_t geo; /* current fs geometry */ + struct xfs_fsop_geom geo; /* current fs geometry */ int iflag; /* -i flag */ int isint; /* log is currently internal */ int lflag; /* -l flag */ @@ -52,7 +52,7 @@ main(int argc, char **argv) int maxpct; /* -m flag value */ int mflag; /* -m flag */ int nflag; /* -n flag */ - xfs_fsop_geom_t ngeo; /* new fs geometry */ + struct xfs_fsop_geom ngeo; /* new fs geometry */ int rflag; /* -r flag */ long long rsize; /* new rt size in fs blocks */ int xflag; /* -x flag */ diff --git a/io/init.c b/io/init.c index 83f08f2d..7025aea5 100644 --- a/io/init.c +++ b/io/init.c @@ -133,7 +133,7 @@ init( int c, flags = 0; char *sp; mode_t mode = 0600; - xfs_fsop_geom_t geometry = { 0 }; + struct xfs_fsop_geom geometry = { 0 }; struct fs_path fsp; progname = basename(argv[0]); diff --git a/io/io.h b/io/io.h index 6469179e..0848ab98 100644 --- a/io/io.h +++ b/io/io.h @@ -38,7 +38,7 @@ typedef struct fileio { int fd; /* open file descriptor */ int flags; /* flags describing file state */ char *name; /* file name at time of open */ - xfs_fsop_geom_t geom; /* XFS filesystem geometry */ + struct xfs_fsop_geom geom; /* XFS filesystem geometry */ struct fs_path fs_path; /* XFS path information */ } fileio_t; @@ -70,9 +70,9 @@ extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int); */ extern off64_t filesize(void); -extern int openfile(char *, xfs_fsop_geom_t *, int, mode_t, +extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t, struct fs_path *); -extern int addfile(char *, int , xfs_fsop_geom_t *, int, +extern int addfile(char *, int , struct xfs_fsop_geom *, int, struct fs_path *); extern void printxattr(uint, int, int, const char *, int, int); diff --git a/io/open.c b/io/open.c index 11805cd7..ce7a5362 100644 --- a/io/open.c +++ b/io/open.c @@ -51,7 +51,7 @@ static long extsize; int openfile( char *path, - xfs_fsop_geom_t *geom, + struct xfs_fsop_geom *geom, int flags, mode_t mode, struct fs_path *fs_path) @@ -156,7 +156,7 @@ int addfile( char *name, int fd, - xfs_fsop_geom_t *geometry, + struct xfs_fsop_geom *geometry, int flags, struct fs_path *fs_path) { @@ -229,7 +229,7 @@ open_f( int c, fd, flags = 0; char *sp; mode_t mode = 0600; - xfs_fsop_geom_t geometry = { 0 }; + struct xfs_fsop_geom geometry = { 0 }; struct fs_path fsp; if (argc == 1) { diff --git a/man/man3/xfsctl.3 b/man/man3/xfsctl.3 index 6e5027c4..462ccbd8 100644 --- a/man/man3/xfsctl.3 +++ b/man/man3/xfsctl.3 @@ -640,7 +640,7 @@ operations on XFS filesystems. For .B XFS_IOC_FSGEOMETRY (get filesystem mkfs time information), the output structure is of type -.BR xfs_fsop_geom_t . +.BR struct xfs_fsop_geom . For .B XFS_FS_COUNTS (get filesystem dynamic global information), the output structure is of type diff --git a/spaceman/file.c b/spaceman/file.c index d2acf5db..a9b8461f 100644 --- a/spaceman/file.c +++ b/spaceman/file.c @@ -44,7 +44,7 @@ print_f( int openfile( char *path, - xfs_fsop_geom_t *geom, + struct xfs_fsop_geom *geom, struct fs_path *fs_path) { struct fs_path *fsp; @@ -84,7 +84,7 @@ int addfile( char *name, int fd, - xfs_fsop_geom_t *geometry, + struct xfs_fsop_geom *geometry, struct fs_path *fs_path) { char *filename; diff --git a/spaceman/init.c b/spaceman/init.c index 181a3446..c845f920 100644 --- a/spaceman/init.c +++ b/spaceman/init.c @@ -60,7 +60,7 @@ init( char **argv) { int c; - xfs_fsop_geom_t geometry = { 0 }; + struct xfs_fsop_geom geometry = { 0 }; struct fs_path fsp; progname = basename(argv[0]); diff --git a/spaceman/space.h b/spaceman/space.h index bf9cc2bf..b246f602 100644 --- a/spaceman/space.h +++ b/spaceman/space.h @@ -7,7 +7,7 @@ #define XFS_SPACEMAN_SPACE_H_ typedef struct fileio { - xfs_fsop_geom_t geom; /* XFS filesystem geometry */ + struct xfs_fsop_geom geom; /* XFS filesystem geometry */ struct fs_path fs_path; /* XFS path information */ char *name; /* file name at time of open */ int fd; /* open file descriptor */ @@ -17,8 +17,8 @@ extern fileio_t *filetable; /* open file table */ extern int filecount; /* number of open files */ extern fileio_t *file; /* active file in file table */ -extern int openfile(char *, xfs_fsop_geom_t *, struct fs_path *); -extern int addfile(char *, int , xfs_fsop_geom_t *, struct fs_path *); +extern int openfile(char *, struct xfs_fsop_geom *, struct fs_path *); +extern int addfile(char *, int , struct xfs_fsop_geom *, struct fs_path *); extern void print_init(void); extern void help_init(void);