From: Dave Chinner <david@fromorbit.com>
To: Jan Tulak <jtulak@redhat.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 11/14] xfsprogs: Add statvfs64 for osx
Date: Wed, 23 Sep 2015 13:32:18 +1000 [thread overview]
Message-ID: <20150923033218.GP3902@dastard> (raw)
In-Reply-To: <1442311164-12921-12-git-send-email-jtulak@redhat.com>
On Tue, Sep 15, 2015 at 11:59:21AM +0200, Jan Tulak wrote:
> Simply rename statvfs64 to statfs with a #define.
> OSX version of statvfs is missing some members, so if the renaming
> is in effect (stavfs64 is defined), don't try to use them and go
> directly for the other member value.
>
> Signed-off-by: Jan Tulak <jtulak@redhat.com>
> ---
> fsr/xfs_fsr.c | 14 ++++++++++++++
> include/builddefs.in | 2 +-
> include/darwin.h | 5 +++++
> 3 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
> index e1b7bd6..5f95cdc 100644
> --- a/fsr/xfs_fsr.c
> +++ b/fsr/xfs_fsr.c
> @@ -36,6 +36,12 @@
> # include <mntent.h>
> #endif
>
> +#ifdef __APPLE__
> +//# define statvfs64 statfs;
> +# include <sys/param.h>
> +# include <sys/mount.h>
> +#endif
Why is this here? We've included libxfs.h in this file, so we've
got access to the platform specific includes already, and later in
the patch you put the commented out define there...
> +
> #ifndef XFS_XFLAG_NODEFRAG
> #define XFS_XFLAG_NODEFRAG 0x00002000 /* src dependancy, remove later */
> #endif
> @@ -948,7 +954,11 @@ fsrfile_common(
> fname, strerror(errno));
> return -1;
> }
> +#ifndef statvfs64
> bsize = vfss.f_frsize ? vfss.f_frsize : vfss.f_bsize;
> +#else
> + bsize = vfss.f_bsize;
> +#endif
bsize = platform_statvfs_bsize(&vfss);
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-09-23 3:32 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-15 9:59 [PATCH 00/14 v5] xfsprogs: Partial OSX support Jan Tulak
2015-09-15 9:59 ` [PATCH 01/14] xfsprogs: Add a way to compile without blkid Jan Tulak
2015-09-15 9:59 ` [PATCH 02/14] xfsprogs: Add XATTR_LIST_MAX to OS X headers Jan Tulak
2015-09-15 9:59 ` [PATCH 03/14] xfsprogs: avoid dependency on Linux XATTR_SIZE_MAX Jan Tulak
2015-09-23 3:09 ` Dave Chinner
2015-09-15 9:59 ` [PATCH 04/14] xfsprogs: prefix XATTR_LIST_MAX with XFS_ Jan Tulak
2015-09-23 3:15 ` Dave Chinner
2015-09-24 8:28 ` Jan Tulak
2015-09-24 22:41 ` Dave Chinner
2015-10-07 11:17 ` [PATCH 04/14 v2] " Jan Tulak
2015-09-15 9:59 ` [PATCH 05/14] xfsprogs: Add includes required for OS X builds (delta) Jan Tulak
2015-09-15 9:59 ` [PATCH 06/14] xfsprogs: Add autoconf check for fsetxattr call Jan Tulak
2015-09-15 9:59 ` [PATCH 07/14] xfsprogs: uuid changes for OS X Jan Tulak
2015-09-15 9:59 ` [PATCH 08/14] xfsprogs: Remove conflicting define " Jan Tulak
2015-09-15 9:59 ` [PATCH 09/14] xfsprogs: change nftw64 to nftw Jan Tulak
2015-09-15 9:59 ` [PATCH 10/14] xfsprogs: Add a timer implementation for OS X Jan Tulak
2015-09-23 3:25 ` Dave Chinner
2015-09-24 9:26 ` Jan Tulak
2015-09-30 8:23 ` [PATCH 10/14 v2] " Jan Tulak
2015-09-15 9:59 ` [PATCH 11/14] xfsprogs: Add statvfs64 for osx Jan Tulak
2015-09-23 3:32 ` Dave Chinner [this message]
2015-09-24 9:33 ` Jan Tulak
2015-09-30 8:21 ` [PATCH 11/14 v2] " Jan Tulak
2015-09-15 9:59 ` [PATCH 12/14] xfsprogs: make fsr use mntinfo when there is no mntent Jan Tulak
2015-09-23 3:36 ` Dave Chinner
2015-09-24 14:38 ` Jan Tulak
2015-09-24 22:53 ` Dave Chinner
2015-09-29 16:07 ` Jan Tulak
2015-09-29 16:04 ` [PATCH 12/14 v2] " Jan Tulak
2015-10-13 4:54 ` Dave Chinner
2015-10-13 8:45 ` Jan Tulak
2015-10-13 9:56 ` [PATCH 12/14 v3] " Jan Tulak
2015-09-15 9:59 ` [PATCH 13/14] xfsprogs: Make mremap conditional Jan Tulak
2015-10-13 4:42 ` Dave Chinner
2015-09-15 9:59 ` [PATCH 14/14] xfsprogs: rename lstat64 to lstat for OS X Jan Tulak
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=20150923033218.GP3902@dastard \
--to=david@fromorbit.com \
--cc=jtulak@redhat.com \
--cc=xfs@oss.sgi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox