|
 |
370c56 |
From 8985a04067eb396877593db102d4a535c8a2871a Mon Sep 17 00:00:00 2001
|
|
|
370c56 |
From: Jan Kara <jack@suse.cz>
|
|
|
370c56 |
Date: Mon, 4 Feb 2013 23:21:30 +0100
|
|
|
370c56 |
Subject: [PATCH] quotacheck: Make sure -d provides at least as much
|
|
|
370c56 |
information as -v
|
|
|
370c56 |
|
|
|
370c56 |
There was a couple of useful messages that were printed when -v was
|
|
|
370c56 |
specified but not when -d was specified. Fix this.
|
|
|
370c56 |
|
|
|
370c56 |
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
|
370c56 |
---
|
|
|
370c56 |
quotacheck.c | 10 +++++-----
|
|
|
370c56 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
370c56 |
|
|
|
370c56 |
diff --git a/quotacheck.c b/quotacheck.c
|
|
|
370c56 |
index e047825..e62c3a7 100644
|
|
|
370c56 |
--- a/quotacheck.c
|
|
|
370c56 |
+++ b/quotacheck.c
|
|
|
370c56 |
@@ -880,12 +880,12 @@ static int sub_quota_file(struct mount_entry *mnt, int qtype, int ftype)
|
|
|
370c56 |
|
|
|
370c56 |
debug(FL_DEBUG, _("Substracting space used by old %s quota file.\n"), _(type2name(ftype)));
|
|
|
370c56 |
if (get_qf_name(mnt, ftype, cfmt, 0, &filename) < 0) {
|
|
|
370c56 |
- debug(FL_VERBOSE, _("Old %s file name could not been determined. Usage will not be subtracted.\n"), _(type2name(ftype)));
|
|
|
370c56 |
+ debug(FL_VERBOSE | FL_DEBUG, _("Old %s file name could not been determined. Usage will not be subtracted.\n"), _(type2name(ftype)));
|
|
|
370c56 |
return 0;
|
|
|
370c56 |
}
|
|
|
370c56 |
|
|
|
370c56 |
if (stat(filename, &st) < 0) {
|
|
|
370c56 |
- debug(FL_VERBOSE, _("Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n"), _(type2name(ftype)), filename, strerror(errno));
|
|
|
370c56 |
+ debug(FL_VERBOSE | FL_DEBUG, _("Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n"), _(type2name(ftype)), filename, strerror(errno));
|
|
|
370c56 |
free(filename);
|
|
|
370c56 |
return 0;
|
|
|
370c56 |
}
|
|
|
370c56 |
@@ -961,7 +961,7 @@ Please stop all programs writing to filesystem or use -m flag to force checking.
|
|
|
370c56 |
debug(FL_DEBUG, _("Filesystem remounted read-only\n"));
|
|
|
370c56 |
}
|
|
|
370c56 |
start_scan:
|
|
|
370c56 |
- debug(FL_VERBOSE, _("Scanning %s [%s] "), mnt->me_devname, mnt->me_dir);
|
|
|
370c56 |
+ debug(FL_VERBOSE | FL_DEBUG, _("Scanning %s [%s] "), mnt->me_devname, mnt->me_dir);
|
|
|
370c56 |
#if defined(EXT2_DIRECT)
|
|
|
370c56 |
if (!strcmp(mnt->me_type, MNTTYPE_EXT2) || !strcmp(mnt->me_type, MNTTYPE_EXT3) || !strcmp(mnt->me_type, MNTTYPE_NEXT3)) {
|
|
|
370c56 |
if ((failed = ext2_direct_scan(mnt->me_devname)) < 0)
|
|
|
370c56 |
@@ -977,7 +977,7 @@ start_scan:
|
|
|
370c56 |
goto out;
|
|
|
370c56 |
}
|
|
|
370c56 |
dirs_done++;
|
|
|
370c56 |
- if (flags & FL_VERBOSE || flags & FL_VERYVERBOSE)
|
|
|
370c56 |
+ if (flags & FL_VERBOSE || flags & FL_DEBUG)
|
|
|
370c56 |
fputs(_("done\n"), stdout);
|
|
|
370c56 |
if (ucheck) {
|
|
|
370c56 |
failed |= sub_quota_file(mnt, USRQUOTA, USRQUOTA);
|
|
|
370c56 |
@@ -1171,7 +1171,7 @@ static int check_all(void)
|
|
|
370c56 |
debug(FL_DEBUG, _("Detected quota format %s\n"), fmt2name(cfmt));
|
|
|
370c56 |
}
|
|
|
370c56 |
|
|
|
370c56 |
- if (flags & FL_VERBOSE &&
|
|
|
370c56 |
+ if (flags & (FL_VERBOSE | FL_DEBUG) &&
|
|
|
370c56 |
!str_hasmntopt(mnt->me_opts, MNTOPT_USRJQUOTA) &&
|
|
|
370c56 |
!str_hasmntopt(mnt->me_opts, MNTOPT_GRPJQUOTA) &&
|
|
|
370c56 |
!warned &&
|
|
|
370c56 |
--
|
|
|
370c56 |
1.8.1.2
|
|
|
370c56 |
|