From: "Bill O'Donnell" <billodo@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: xfs@oss.sgi.com
Subject: [PATCH v2 3/3] xfs_quota: add case for foreign fs, disabled regardless of foreign_allowed
Date: Thu, 15 Sep 2016 10:29:46 -0500 [thread overview]
Message-ID: <1473953386-10242-4-git-send-email-billodo@redhat.com> (raw)
In-Reply-To: <1473953386-10242-1-git-send-email-billodo@redhat.com>
Some commands are disallowed for foreign filesystems,
regardless of whether or not the -f flag is thrown.
Add a case for this condition and improve commenting
and output messaging accordingly in init_check_command.
Signed-off-by: Bill O'Donnell <billodo@redhat.com>
---
quota/init.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/quota/init.c b/quota/init.c
index 2c18c8b..7d69663 100644
--- a/quota/init.c
+++ b/quota/init.c
@@ -112,21 +112,28 @@ init_check_command(
if (!fs_path)
return 1;
- /* Always run commands that we are told to skip here */
+ /* Always run commands that are valid for all fs types. */
if (ct->flags & CMD_ALL_FSTYPES)
return 1;
- /* if it's an XFS filesystem, always run the command */
+ /* If it's an XFS filesystem, always run the command. */
if (!(fs_path->fs_flags & FS_FOREIGN))
return 1;
- /* If the user specified foreign filesysetms are ok, run it */
+ /* If the user specified foreign filesystems are ok (-f), run cmd. */
if (foreign_allowed &&
(ct->flags & CMD_FLAG_FOREIGN_OK))
return 1;
- /* foreign filesystem and it's not a valid command! */
- fprintf(stderr, _("%s command is for XFS filesystems only\n"),
+ /* If cmd not allowed on foreign fs, regardless of -f flag, skip it. */
+ if (!(ct->flags & CMD_FLAG_FOREIGN_OK)) {
+ fprintf(stderr, _("%s: command is for XFS filesystems only\n"),
+ ct->name);
+ return 0;
+ }
+
+ /* foreign fs, but cmd only allowed via -f flag. Skip it. */
+ fprintf(stderr, _("%s: foreign filesystem. Use -f to enable.\n"),
ct->name);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-09-15 15:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-14 15:19 [PATCH 0/3] xfsprogs: xfs_quota foreign fs path handling modifications Bill O'Donnell
2016-09-14 15:19 ` [PATCH 1/3] xfsprogs: populate fs table with xfs entries first, foreign entries last Bill O'Donnell
2016-09-14 17:50 ` Eric Sandeen
2016-09-14 19:54 ` Eric Sandeen
2016-09-14 15:19 ` [PATCH 2/3] xfs_quota: print and path output formatting: maintain reverse compatibility Bill O'Donnell
2016-09-14 22:14 ` Eric Sandeen
2016-09-14 15:19 ` [PATCH 3/3] xfs_quota: add case for foreign fs, disabled regardless of foreign_allowed Bill O'Donnell
2016-09-15 15:29 ` [PATCH v2 0/3] xfsprogs: xfs_quota foreign fs path handling modifications Bill O'Donnell
2016-09-15 15:29 ` [PATCH v2 1/3] xfsprogs: populate fs table with xfs entries first, foreign entries last Bill O'Donnell
2016-09-15 19:26 ` Eric Sandeen
2016-09-15 15:29 ` [PATCH v2 2/3] xfs_quota: print and path output formatting: maintain reverse compatibility Bill O'Donnell
2016-09-15 19:27 ` Eric Sandeen
2016-09-15 15:29 ` Bill O'Donnell [this message]
2016-09-15 19:32 ` [PATCH v2 3/3] xfs_quota: add case for foreign fs, disabled regardless of foreign_allowed Eric Sandeen
2016-09-15 19:57 ` [PATCH v3 " Bill O'Donnell
2016-09-15 20:43 ` 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=1473953386-10242-4-git-send-email-billodo@redhat.com \
--to=billodo@redhat.com \
--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 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).