|
 |
30c500 |
From 7b6dfd6390476ec7b811c76e4e2653db2994cad4 Mon Sep 17 00:00:00 2001
|
|
|
30c500 |
From: Jan Kara <jack@suse.cz>
|
|
|
30c500 |
Date: Mon, 5 Feb 2018 15:54:54 +0100
|
|
|
30c500 |
Subject: [PATCH] quotacheck: Report error when caching of quota file fails
|
|
|
30c500 |
MIME-Version: 1.0
|
|
|
30c500 |
Content-Type: text/plain; charset=UTF-8
|
|
|
30c500 |
Content-Transfer-Encoding: 8bit
|
|
|
30c500 |
|
|
|
30c500 |
Currently quotacheck returns with zero exit code even though caching of
|
|
|
30c500 |
quota file fails. Fix it to return with non-zero exit code in that case
|
|
|
30c500 |
as expected.
|
|
|
30c500 |
|
|
|
30c500 |
Reported-by: Christoph Biedl
|
|
|
30c500 |
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
|
30c500 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
30c500 |
---
|
|
|
30c500 |
quotacheck.c | 29 ++++++++++++++++++++++-------
|
|
|
30c500 |
1 file changed, 22 insertions(+), 7 deletions(-)
|
|
|
30c500 |
|
|
|
30c500 |
diff --git a/quotacheck.c b/quotacheck.c
|
|
|
30c500 |
index 9d7940b..b1302b6 100644
|
|
|
30c500 |
--- a/quotacheck.c
|
|
|
30c500 |
+++ b/quotacheck.c
|
|
|
30c500 |
@@ -924,6 +924,7 @@ static int check_dir(struct mount_entry *mnt)
|
|
|
30c500 |
struct stat st;
|
|
|
30c500 |
int remounted = 0;
|
|
|
30c500 |
int failed = 0;
|
|
|
30c500 |
+ int ret;
|
|
|
30c500 |
|
|
|
30c500 |
if (lstat(mnt->me_dir, &st) < 0)
|
|
|
30c500 |
die(2, _("Cannot stat mountpoint %s: %s\n"), mnt->me_dir, strerror(errno));
|
|
|
30c500 |
@@ -939,14 +940,22 @@ static int check_dir(struct mount_entry *mnt)
|
|
|
30c500 |
*/
|
|
|
30c500 |
if (cfmt == QF_XFS)
|
|
|
30c500 |
goto start_scan;
|
|
|
30c500 |
- if (ucheck)
|
|
|
30c500 |
- if (process_file(mnt, USRQUOTA) < 0)
|
|
|
30c500 |
+ if (ucheck) {
|
|
|
30c500 |
+ ret = process_file(mnt, USRQUOTA);
|
|
|
30c500 |
+ if (ret < 0) {
|
|
|
30c500 |
+ failed |= ret;
|
|
|
30c500 |
ucheck = 0;
|
|
|
30c500 |
- if (gcheck)
|
|
|
30c500 |
- if (process_file(mnt, GRPQUOTA) < 0)
|
|
|
30c500 |
+ }
|
|
|
30c500 |
+ }
|
|
|
30c500 |
+ if (gcheck) {
|
|
|
30c500 |
+ ret = process_file(mnt, GRPQUOTA);
|
|
|
30c500 |
+ if (ret < 0) {
|
|
|
30c500 |
+ failed |= ret;
|
|
|
30c500 |
gcheck = 0;
|
|
|
30c500 |
+ }
|
|
|
30c500 |
+ }
|
|
|
30c500 |
if (!ucheck && !gcheck) /* Nothing to check? */
|
|
|
30c500 |
- return 0;
|
|
|
30c500 |
+ return failed;
|
|
|
30c500 |
if (!(flags & FL_NOREMOUNT)) {
|
|
|
30c500 |
/* Now we try to remount fs read-only to prevent races when scanning filesystem */
|
|
|
30c500 |
if (mount
|
|
|
30c500 |
@@ -978,8 +987,11 @@ start_scan:
|
|
|
30c500 |
!strcmp(mnt->me_type, MNTTYPE_EXT3) ||
|
|
|
30c500 |
!strcmp(mnt->me_type, MNTTYPE_NEXT3) ||
|
|
|
30c500 |
!strcmp(mnt->me_type, MNTTYPE_EXT4)) {
|
|
|
30c500 |
- if ((failed = ext2_direct_scan(mnt->me_devname)) < 0)
|
|
|
30c500 |
+ ret = ext2_direct_scan(mnt->me_devname);
|
|
|
30c500 |
+ if (ret < 0) {
|
|
|
30c500 |
+ failed |= ret;
|
|
|
30c500 |
goto out;
|
|
|
30c500 |
+ }
|
|
|
30c500 |
}
|
|
|
30c500 |
else {
|
|
|
30c500 |
#else
|
|
|
30c500 |
@@ -987,8 +999,11 @@ start_scan:
|
|
|
30c500 |
#endif
|
|
|
30c500 |
if (flags & FL_VERYVERBOSE)
|
|
|
30c500 |
putchar('\n');
|
|
|
30c500 |
- if ((failed = scan_dir(mnt->me_dir)) < 0)
|
|
|
30c500 |
+ ret = scan_dir(mnt->me_dir);
|
|
|
30c500 |
+ if (ret < 0) {
|
|
|
30c500 |
+ failed |= ret;
|
|
|
30c500 |
goto out;
|
|
|
30c500 |
+ }
|
|
|
30c500 |
}
|
|
|
30c500 |
dirs_done++;
|
|
|
30c500 |
if (flags & FL_VERBOSE || flags & FL_DEBUG)
|
|
|
30c500 |
--
|
|
|
30c500 |
2.13.6
|
|
|
30c500 |
|