|
 |
1eb6fb3 |
From 1c3bc6d34439f353ea00239dc1ca31239823bb4f Mon Sep 17 00:00:00 2001
|
|
|
1eb6fb3 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
1eb6fb3 |
Date: Fri, 1 Jul 2011 10:22:10 +0200
|
|
|
1eb6fb3 |
Subject: [PATCH 2/2] get_qf_name() does not check quota file presence
|
|
|
1eb6fb3 |
|
|
|
1eb6fb3 |
Old error messsage stated a quota file does not exist despite fact
|
|
|
1eb6fb3 |
get_qf_name() does not check the file existence. It constructs the
|
|
|
1eb6fb3 |
file name only.
|
|
|
1eb6fb3 |
|
|
|
1eb6fb3 |
This lead to misleading message when running initial `quotacheck -c'
|
|
|
1eb6fb3 |
on extended file system mounted with usrquota option only.
|
|
|
1eb6fb3 |
|
|
|
1eb6fb3 |
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
|
1eb6fb3 |
---
|
|
|
1eb6fb3 |
quotacheck.c | 4 ++--
|
|
|
1eb6fb3 |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
1eb6fb3 |
|
|
|
1eb6fb3 |
diff --git a/quotacheck.c b/quotacheck.c
|
|
|
1eb6fb3 |
index 112596b..d8515af 100644
|
|
|
1eb6fb3 |
--- a/quotacheck.c
|
|
|
1eb6fb3 |
+++ b/quotacheck.c
|
|
|
1eb6fb3 |
@@ -873,12 +873,12 @@ static int sub_quota_file(struct mntent *mnt, int qtype, int ftype)
|
|
|
1eb6fb3 |
|
|
|
1eb6fb3 |
debug(FL_DEBUG, _("Substracting space used by old %s quota file.\n"), type2name(ftype));
|
|
|
1eb6fb3 |
if (get_qf_name(mnt, ftype, cfmt, 0, &filename) < 0) {
|
|
|
1eb6fb3 |
- debug(FL_VERBOSE, _("Old %s file not found. Usage will not be substracted.\n"), type2name(ftype));
|
|
|
1eb6fb3 |
+ debug(FL_VERBOSE, _("Old %s file name could not been determined. Usage will not be substracted.\n"), type2name(ftype));
|
|
|
1eb6fb3 |
return 0;
|
|
|
1eb6fb3 |
}
|
|
|
1eb6fb3 |
|
|
|
1eb6fb3 |
if (stat(filename, &st) < 0) {
|
|
|
1eb6fb3 |
- debug(FL_VERBOSE, _("Cannot stat old %s quota file: %s\n"), type2name(ftype), strerror(errno));
|
|
|
1eb6fb3 |
+ debug(FL_VERBOSE, _("Cannot stat old %s quota file %s: %s. Usage will not be substracted.\n"), type2name(ftype), filename, strerror(errno));
|
|
|
1eb6fb3 |
free(filename);
|
|
|
1eb6fb3 |
return 0;
|
|
|
1eb6fb3 |
}
|
|
|
1eb6fb3 |
--
|
|
|
1eb6fb3 |
1.7.6
|
|
|
1eb6fb3 |
|