summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjkar8572 <jkar8572>2010-02-17 11:57:05 +0000
committerjkar8572 <jkar8572>2010-02-17 11:57:05 +0000
commite1ab37abb5d82b7bdc50c1dc214c538e21b5eb31 (patch)
tree0fe1426122d066e0efd5ecc88828d451344ed4be
parent458809b95cedcbd64334d28df53af23412a94779 (diff)
* don't try to set inode flags when getting them failed (Michalski Wojciech)
-rw-r--r--Changelog1
-rw-r--r--quotacheck.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 1f5a3c4..c2931a6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
Changes in quota-tools from 3.17 to 4.00-pre1
+* don't try to set inode flags when getting them failed (Michalski Wojciech)
* added liblber to the list of libraries needed for LDAP support (Michael Meskes)
* Rewritten configuration script to create config.h (Jan Kara)
* Use /proc/mounts for mountpoint scanning (Jan Kara)
diff --git a/quotacheck.c b/quotacheck.c
index 183b99c..41901f1 100644
--- a/quotacheck.c
+++ b/quotacheck.c
@@ -714,9 +714,9 @@ static int rename_files(struct mntent *mnt, int type)
}
if (ioctl(fd, EXT2_IOC_GETFLAGS, &ext2_flags) < 0)
debug(FL_DEBUG, _("EXT2_IOC_GETFLAGS failed: %s\n"), strerror(errno));
- /* IMMUTABLE flag set probably because system crashed and quota was not properly
- * turned off */
- if (ext2_flags & EXT2_IMMUTABLE_FL) {
+ else if (ext2_flags & EXT2_IMMUTABLE_FL) {
+ /* IMMUTABLE flag set probably because system crashed and quota
+ * was not properly turned off */
debug(FL_DEBUG | FL_VERBOSE, _("Quota file %s has IMMUTABLE flag set. Clearing.\n"), filename);
ext2_flags &= ~EXT2_IMMUTABLE_FL;
if (ioctl(fd, EXT2_IOC_SETFLAGS, &ext2_flags) < 0) {