From: Dave Chinner <david@fromorbit.com>
To: Felix Janda <felix.janda@posteo.de>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 2/6] libxfs/linux.c: Replace use of ustat by stat
Date: Thu, 8 Sep 2016 10:00:15 +1000 [thread overview]
Message-ID: <20160908000015.GS30056@dastard> (raw)
In-Reply-To: <20160112195945.GC568@nyan>
On Tue, Jan 12, 2016 at 08:59:45PM +0100, Felix Janda wrote:
> ustat has been used to check whether a device file is mounted.
> The function is deprecated and not supported by uclibc and musl.
> Now do the check using the *mntent functions.
>
> Based on patch by Natanael Copa <ncopa@alpinelinux.org>.
>
> Signed-off-by: Felix Janda <felix.janda@posteo.de>
So, nobody has bothered to actually test this patch...
$ sudo mkfs.xfs -f -m rmapbt=1 -i sparse=1 -b size=1k /dev/sdc
specified blocksize 1024 is less than device physical sector size 4096
switching to logical sector size 512
Usage: mkfs.xfs
/* blocksize */ [-b log=n|size=num]
/* metadata */ [-m crc=0|1,finobt=0|1,uuid=xxx,rmapbt=0|1]
....
$ sudo xfs_db /dev/sdc
fatal error -- couldn't initialize XFS library
$
And so on. Basic sanity testing fails.
> @@ -63,14 +61,27 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
> s = &st;
> }
>
> - if (ustat(s->st_rdev, ust) >= 0) {
> + strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED);
> + if ((f = setmntent(mounts, "r")) == NULL) {
> + fprintf(stderr,
> + _("%s: %s possibly contains a mounted filesystem\n"),
> + progname, name);
> + return 1;
> + }
> + while ((mnt = getmntent(f)) != NULL) {
> + if (stat64(mnt->mnt_dir, &mst) < 0)
> + continue;
> + if (mst.st_dev != s->st_rdev)
> + continue;
> +
> if (verbose)
> fprintf(stderr,
> _("%s: %s contains a mounted filesystem\n"),
> progname, name);
> - return 1;
> + break;
> }
> - return 0;
> + endmntent(f);
> + return mnt == NULL;
Because that return statement has the wrong logic. It should be:
+ return mnt != NULL;
to return the correct values.
In future, please do more than a compile test on your patches before
sending them to the list for review, no matter how simple and
obviously correct you think they are!
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:[~2016-09-08 0:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1452627740.git.felix.janda@posteo.de>
2016-01-12 19:59 ` [PATCH 1/6] Move from __uint*_t types to uint*_t and likewise for __int*_t Felix Janda
2016-01-12 21:24 ` Dave Chinner
2016-01-12 21:46 ` Felix Janda
2016-01-12 22:02 ` Dave Chinner
2016-01-13 7:48 ` Christoph Hellwig
2016-01-20 0:46 ` Dave Chinner
2016-01-12 19:59 ` [PATCH 2/6] libxfs/linux.c: Replace use of ustat by stat Felix Janda
2016-01-12 21:24 ` Dave Chinner
2016-01-12 21:33 ` Felix Janda
2016-01-13 7:55 ` Christoph Hellwig
2016-01-13 17:42 ` Felix Janda
2016-01-14 10:20 ` Christoph Hellwig
2016-01-14 19:07 ` Felix Janda
2016-06-18 14:53 ` Felix Janda
2016-06-22 12:59 ` Christoph Hellwig
2016-09-04 1:23 ` Eric Sandeen
2016-09-08 0:00 ` Dave Chinner [this message]
2016-01-12 19:59 ` [PATCH 3/6] fsr/xfs_fsr.c: Include <paths.h> for _PATH_MOUNTED Felix Janda
2016-01-13 7:55 ` Christoph Hellwig
2016-01-12 20:00 ` [PATCH 4/6] linux.h: Use off64_t instead of loff_t Felix Janda
2016-01-13 7:55 ` Christoph Hellwig
2016-01-12 20:00 ` [PATCH 5/6] include/linux.h: Include <stdio.h> for fprintf and stderr Felix Janda
2016-01-13 7:55 ` Christoph Hellwig
2016-01-12 20:00 ` [PATCH 6/6] Add configure check for members of dirent for use in io/readdir.c Felix Janda
2016-01-12 21:30 ` Dave Chinner
2016-01-12 21:37 ` Felix Janda
2016-01-12 22:37 ` Dave Chinner
2016-01-13 7:58 ` Christoph Hellwig
2016-01-13 17:09 ` Felix Janda
2016-01-14 10:17 ` Christoph Hellwig
2016-01-14 19:06 ` Felix Janda
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=20160908000015.GS30056@dastard \
--to=david@fromorbit.com \
--cc=felix.janda@posteo.de \
--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;
as well as URLs for NNTP newsgroup(s).