From: Eric Sandeen <sandeen@sandeen.net>
To: xfs-oss <xfs@oss.sgi.com>, linux-xfs@vger.kernel.org
Subject: [PATCH 1/2] libxfs: move iswritable "fatal" decision to caller
Date: Mon, 19 Sep 2016 17:08:24 -0500 [thread overview]
Message-ID: <62f0019d-c2fb-bda8-8549-a6985d4be6a4@sandeen.net> (raw)
In-Reply-To: <bf987720-16ef-164a-2b0f-ba7cbb13b399@sandeen.net>
Simplify platform_check_iswritable by moving the "fatal decision
up to the (one) caller. In other words, simply return whether
mounted+writable is true, and return 1 if so. Caller decides
what to do with that info based on /its/ "fatal" argument.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
V2: Rebase
diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index 017e190..19d2ab6 100644
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -33,7 +33,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
}
int
-platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
+platform_check_iswritable(char *name, char *block, struct stat64 *s)
{
int fd, writable;
diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index 6c9f089..9e22183 100644
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -66,7 +66,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
}
int
-platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
+platform_check_iswritable(char *name, char *block, struct stat64 *s)
{
int cnt, i;
struct statfs *fsinfo;
@@ -74,7 +74,7 @@ platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
if ((cnt = getmntinfo(&fsinfo, MNT_NOWAIT)) == 0) {
fprintf(stderr, _("%s: %s contains a possibly writable, "
"mounted filesystem\n"), progname, name);
- return fatal;
+ return 1;
}
for (i = 0; i < cnt; i++) {
@@ -88,7 +88,7 @@ platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
if (i == cnt) {
fprintf(stderr, _("%s: %s contains a mounted and writable "
"filesystem\n"), progname, name);
- return fatal;
+ return 1;
}
return 0;
}
diff --git a/libxfs/init.c b/libxfs/init.c
index c13b123..828ae3e 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -75,7 +75,9 @@ check_isactive(char *name, char *block, int fatal)
return 0;
if (platform_check_ismounted(name, block, &st, 0) == 0)
return 0;
- return platform_check_iswritable(name, block, &st, fatal);
+ if (platform_check_iswritable(name, block, &st))
+ return fatal ? 1 : 0;
+ return 0;
}
/* libxfs_device_to_fd:
diff --git a/libxfs/init.h b/libxfs/init.h
index 112febb..4dda3ee 100644
--- a/libxfs/init.h
+++ b/libxfs/init.h
@@ -22,8 +22,7 @@ struct stat64;
extern int platform_check_ismounted (char *path, char *block,
struct stat64 *sptr, int verbose);
-extern int platform_check_iswritable (char *path, char *block,
- struct stat64 *sptr, int fatal);
+extern int platform_check_iswritable (char *path, char *block, struct stat64 *sptr);
extern int platform_set_blocksize (int fd, char *path, dev_t device, int bsz, int fatal);
extern void platform_flush_device (int fd, dev_t device);
extern char *platform_findrawpath(char *path);
diff --git a/libxfs/irix.c b/libxfs/irix.c
index 65aaa7e..c23ebe0 100644
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -31,7 +31,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
}
int
-platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
+platform_check_iswritable(char *name, char *block, struct stat64 *s)
{
return 1;
}
diff --git a/libxfs/linux.c b/libxfs/linux.c
index 44bc1f9..2b67d1a 100644
--- a/libxfs/linux.c
+++ b/libxfs/linux.c
@@ -85,9 +85,8 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
}
int
-platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
+platform_check_iswritable(char *name, char *block, struct stat64 *s)
{
- int sts = 0;
FILE *f;
struct stat64 mst;
struct mntent *mnt;
@@ -97,7 +96,7 @@ platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
if ((f = setmntent(mounts, "r")) == NULL) {
fprintf(stderr, _("%s: %s contains a possibly writable, "
"mounted filesystem\n"), progname, name);
- return fatal;
+ return 1;
}
while ((mnt = getmntent(f)) != NULL) {
if (stat64(mnt->mnt_fsname, &mst) < 0)
@@ -108,13 +107,14 @@ platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
&& hasmntopt(mnt, MNTOPT_RO) != NULL)
break;
}
+ endmntent(f);
+
if (mnt == NULL) {
fprintf(stderr, _("%s: %s contains a mounted and writable "
"filesystem\n"), progname, name);
- sts = fatal;
+ return 1;
}
- endmntent(f);
- return sts;
+ return 0;
}
int
next prev parent reply other threads:[~2016-09-19 22:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 22:06 [PATCH 0/2 V2] fix up mount check handling Eric Sandeen
2016-09-19 22:08 ` Eric Sandeen [this message]
2016-09-19 22:11 ` [PATCH 2/2] libxfs: factor mount checks into helper function Eric Sandeen
-- strict thread matches above, loose matches on Subject: below --
2016-09-08 14:07 [PATCH 0/2] libxfs: fix up mount check handling Eric Sandeen
2016-09-08 14:10 ` [PATCH 1/2] libxfs: move iswritable "fatal" decision to caller 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=62f0019d-c2fb-bda8-8549-a6985d4be6a4@sandeen.net \
--to=sandeen@sandeen.net \
--cc=linux-xfs@vger.kernel.org \
--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 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.