misc: remove all use of xfs_fsop_geom_t

Remove all the uses of the old xfs_fsop_geom_t typedef.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 2af7e5ba0b7c58aa40a07b73e68fabbf9ac8b486..20089d2bd8d35c421b2e8fe9197b23d4aada8e89 100644 (file)
--- 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 83f08f2da8d4c1ab45aa083c49adcd3554f85e7b..7025aea5f77b227882b50e832eac8d4f3402028b 100644 (file)
--- 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 6469179ecb6b91fadfea2f045f5b06d4ac17e9be..0848ab989101c98d52fdb4800f1d5f9b587e0b15 100644 (file)
--- 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 a406ea542eb4adb1ac822dcee5c3a0f29bf279bd..c7f5248a9b13353f597b2a98f9deca9ce72337f4 100644 (file)
--- 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 6e5027c44c3d65d5594415564679fa8b3432e61e..462ccbd82a395e24055c401bd803ca657bdbfb60 100644 (file)
--- 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 985495171cef9dad0c4ad88519fde2a21831e522..7e33e07e42af5d78f203b0e964fff8048c24edb0 100644 (file)
--- 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 181a3446282b3d25188679e72864e6473c6e0802..c845f9205c947fd85896ace3a3761bb875a73343 100644 (file)
--- 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 bf9cc2bfcb7e7f45c7d0fdaf69ddf51e371fe14a..b246f602cf4afc819bfae76c8fdef145049fb0a9 100644 (file)
--- 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);