From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eric Sandeen <sandeen@sandeen.net>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 06/12] misc: remove all use of xfs_fsop_geom_t
Date: Tue, 21 May 2019 09:58:22 -0700 [thread overview]
Message-ID: <20190521165822.GC5141@magnolia> (raw)
In-Reply-To: <210bdf1c-646c-96dd-287d-929178a62b7d@sandeen.net>
On Tue, May 21, 2019 at 11:43:43AM -0500, Eric Sandeen wrote:
> On 5/20/19 6:17 PM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Remove all the uses of the old xfs_fsop_geom_t typedef.
>
> Ok. Any complaint if I tab stuff out to line up again when I commit
> it, assuming it doesn't cause 80char problems?
None here.
--D
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
>
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > 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);
> >
next prev parent reply other threads:[~2019-05-21 16:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 23:16 [PATCH 00/12] xfsprogs-5.1: fix various problems Darrick J. Wong
2019-05-20 23:16 ` [PATCH 01/12] libxfs: fix attr include mess Darrick J. Wong
2019-05-21 16:30 ` Eric Sandeen
2019-05-20 23:16 ` [PATCH 02/12] libxfs: set m_finobt_nores when initializing library Darrick J. Wong
2019-05-21 16:33 ` Eric Sandeen
2019-05-20 23:17 ` [PATCH 03/12] libxfs: refactor online geometry queries Darrick J. Wong
2019-05-21 16:38 ` Eric Sandeen
2019-05-21 16:58 ` Darrick J. Wong
2019-05-20 23:17 ` [PATCH 04/12] libxfs: refactor open-coded bulkstat calls Darrick J. Wong
2019-05-20 23:17 ` [PATCH 05/12] libxfs: refactor open-coded INUMBERS calls Darrick J. Wong
2019-05-20 23:17 ` [PATCH 06/12] misc: remove all use of xfs_fsop_geom_t Darrick J. Wong
2019-05-21 16:43 ` Eric Sandeen
2019-05-21 16:58 ` Darrick J. Wong [this message]
2019-05-20 23:17 ` [PATCH 07/12] libfrog: fix bitmap return values Darrick J. Wong
2019-05-21 16:54 ` Eric Sandeen
2019-05-21 17:01 ` Darrick J. Wong
2019-05-21 18:59 ` Eric Sandeen
2019-05-21 19:19 ` Christoph Hellwig
2019-05-21 19:20 ` Eric Sandeen
2019-05-21 19:28 ` Christoph Hellwig
2019-05-21 19:33 ` Eric Sandeen
2019-05-22 16:23 ` Eric Sandeen
2019-05-20 23:17 ` [PATCH 08/12] xfs_repair: refactor namecheck functions Darrick J. Wong
2019-05-21 19:16 ` Eric Sandeen
2019-05-20 23:17 ` [PATCH 09/12] xfs_scrub: fix background-mode sleep throttling Darrick J. Wong
2019-05-21 19:18 ` Eric Sandeen
2019-05-20 23:17 ` [PATCH 10/12] mkfs: allow setting dax flag on root directory Darrick J. Wong
2019-05-21 19:19 ` Eric Sandeen
2019-05-20 23:17 ` [PATCH 11/12] mkfs: validate start and end of aligned logs Darrick J. Wong
2019-05-21 19:24 ` Eric Sandeen
2019-05-22 16:42 ` Darrick J. Wong
2019-05-20 23:18 ` [PATCH 12/12] mkfs: enable reflink by default Darrick J. Wong
2019-05-21 19:27 ` Eric Sandeen
2019-05-21 19:30 ` [PATCH 12/12 V2] " Eric Sandeen
2019-05-22 16:44 ` Darrick J. Wong
2019-05-22 16:46 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190521165822.GC5141@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.