vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

libquota: fix quota_inode_truncate() 

We failed to clear EXT2_FLAG_SUPER_ONLY after deleting the
quota inode and so, the updated block bitmap was not written
back. This caused fsck to complain after running
'tune2fs -O ^quota <dev>'. Clear this flag so that updated
block bitmap gets written. Also, avoid truncating the quota
inode if it is not hidden.

Signed-off-by: Aditya Kali <adityakali@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
bitmap-optimize
Aditya Kali 2012-07-13 15:25:07 -07:00 committed by Theodore Ts'o
parent 5027751530
commit ad64902b70
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/quota/quotaio.c
View File

@ -133,14 +133,18 @@ errcode_t quota_inode_truncate(ext2_filsys fs, ext2_ino_t ino)
if ((err = ext2fs_read_inode(fs, ino, &inode)))
return err;
inode.i_dtime = fs->now ? fs->now : time(0);
if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
return 0;
if ((ino == EXT4_USR_QUOTA_INO) || (ino == EXT4_GRP_QUOTA_INO)) {
inode.i_dtime = fs->now ? fs->now : time(0);
if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
return 0;
ext2fs_block_iterate3(fs, ino, BLOCK_FLAG_READ_ONLY, NULL,
release_blocks_proc, NULL);
memset(&inode, 0, sizeof(struct ext2_inode));
ext2fs_block_iterate3(fs, ino, BLOCK_FLAG_READ_ONLY, NULL,
release_blocks_proc, NULL);
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
memset(&inode, 0, sizeof(struct ext2_inode));
} else {
inode.i_flags &= ~EXT2_IMMUTABLE_FL;
}
err = ext2fs_write_inode(fs, ino, &inode);
return err;
}