From: Dave Chinner <david@fromorbit.com>
To: Jan Tulak <jtulak@redhat.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 12/14 v2] xfsprogs: make fsr use mntinfo when there is no mntent
Date: Tue, 13 Oct 2015 15:54:42 +1100 [thread overview]
Message-ID: <20151013045442.GG31326@dastard> (raw)
In-Reply-To: <1443542653-10525-1-git-send-email-jtulak@redhat.com>
On Tue, Sep 29, 2015 at 06:04:13PM +0200, Jan Tulak wrote:
> UPDATE:
> - refactor ifdefs to platform_ functions
>
> For what fsr needs, mntinfo can be used instead of mntent on some
> platforms. Exctract the platform-specific code to platform headers.
>
> Signed-off-by: Jan Tulak <jtulak@redhat.com>
I haven't commited this patch - I think it still needs some work
to clean up....
> static void
> initallfs(char *mtab)
> {
> - FILE *fp;
> struct mntent *mp;
> int mi;
> char *cp;
> struct stat64 sb;
>
> - fp = setmntent(mtab, "r");
> - if (fp == NULL) {
> - fsrprintf(_("could not open mtab file: %s\n"), mtab);
> - exit(1);
> - }
> -
> /* malloc a number of descriptors, increased later if needed */
> if (!(fsbase = (fsdesc_t *)malloc(fsbufsize * sizeof(fsdesc_t)))) {
> fsrprintf(_("out of memory: %s\n"), strerror(errno));
> @@ -427,7 +425,36 @@ initallfs(char *mtab)
> /* find all rw xfs file systems */
> mi = 0;
> fs = fsbase;
> +
> +#if defined(HAVE_GETMNTENT)
> + FILE *fp;
> + fp = setmntent(mtab, "r");
> + if (fp == NULL) {
> + fsrprintf(_("could not open mtab file: %s\n"), mtab);
> + exit(1);
> + }
> +
> while ((mp = getmntent(fp))) {
> +#elif defined(HAVE_GETMNTINFO)
> + struct statfs *stats;
> + int error, i, count;
> + // because "t" is a pointer, but we don't need to use
> + // malloc for this usage
> + struct mntent mp_tmp;
> + mp = &mp_tmp;
> + error = 0;
> + if ((count = getmntinfo(&stats, 0)) < 0) {
> + fprintf(stderr, _("%s: getmntinfo() failed: %s\n"),
> + progname, strerror(errno));
> + exit(1);
> + }
> +
> + for (i = 0; i < count; i++) {
> + mntinfo2mntent(&stats[i], mp);
> +#else
> +# error "How do I extract info about mounted filesystems on this platform?"
> +#endif
this stuff here. This iteration should be able to be done via the
cursor abstraction, such as by keeping the iteration information
within the cursor...
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-10-13 4:54 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
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 [this message]
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=20151013045442.GG31326@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