korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-12-01 05:53:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2fsck: Fix check for hidden quota files

Browse Source 
Currently e2fsck always incorrectly detects that quota inodes
need to be hidden (even if they are already hidden) and
modifies the superblock unnecessarily. This patch fixes the
check for hidden quota files and avoids modifying the
filesystem if quota inodes are already hidden.
Also, zero-out the old quota inode so that next fsck scan
doesn't complain.

Signed-off-by: Aditya Kali <adityakali@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Aditya Kali 2012-04-24 14:36:42 -04:00 committed by Theodore Ts'o
parent 1d520184ee
commit ec7686e3e7
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2fsck/problem.c
View File

@ -410,7 +410,7 @@ static struct e2fsck_problem problem_table[] = {
/* Making quota file hidden */
{ PR_0_HIDE_QUOTA,
N_("Making @q @is hidden.\n\n"),
N_("Making @q @i %i (%Q) hidden.\n"),
PROMPT_NONE, PR_PREEN_OK },
/* Superblock has invalid MMP block. */

31
e2fsck/quota.c
View File

@ -24,6 +24,10 @@ static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino,
struct ext2_inode inode;
char qf_name[QUOTA_NAME_LEN];
/* We need the inode bitmap to be loaded */
if (ext2fs_read_bitmaps(fs))
return;
if (ext2fs_read_inode(fs, from_ino, &inode))
return;
@ -39,6 +43,9 @@ static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino,
quota_get_qf_name(qtype, QFMT_VFS_V1, qf_name);
ext2fs_unlink(fs, EXT2_ROOT_INO, qf_name, from_ino, 0);
ext2fs_inode_alloc_stats(fs, from_ino, -1);
/* Clear out the original inode in the inode-table block. */
memset(&inode, 0, sizeof(struct ext2_inode));
ext2fs_write_inode(fs, from_ino, &inode);
}
void e2fsck_hide_quota(e2fsck_t ctx)
@ -53,31 +60,19 @@ void e2fsck_hide_quota(e2fsck_t ctx)
!(sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA))
return;
/* We need the inode bitmap to be loaded */
if (ext2fs_read_bitmaps(fs))
return;
if (!sb->s_usr_quota_inum && !sb->s_grp_quota_inum)
/* nothing to do */
return;
if (sb->s_usr_quota_inum == EXT4_USR_QUOTA_INO &&
sb->s_grp_quota_inum == EXT4_GRP_QUOTA_INO)
/* nothing to do */
return;
if (!fix_problem(ctx, PR_0_HIDE_QUOTA, &pctx))
return;
pctx.ino = sb->s_usr_quota_inum;
if (sb->s_usr_quota_inum &&
sb->s_usr_quota_inum != EXT4_USR_QUOTA_INO) {
(sb->s_usr_quota_inum != EXT4_USR_QUOTA_INO) &&
fix_problem(ctx, PR_0_HIDE_QUOTA, &pctx)) {
move_quota_inode(fs, sb->s_usr_quota_inum, EXT4_USR_QUOTA_INO,
USRQUOTA);
sb->s_usr_quota_inum = EXT4_USR_QUOTA_INO;
}
pctx.ino = sb->s_grp_quota_inum;
if (sb->s_grp_quota_inum &&
sb->s_grp_quota_inum != EXT4_GRP_QUOTA_INO) {
(sb->s_grp_quota_inum != EXT4_GRP_QUOTA_INO) &&
fix_problem(ctx, PR_0_HIDE_QUOTA, &pctx)) {
move_quota_inode(fs, sb->s_grp_quota_inum, EXT4_GRP_QUOTA_INO,
GRPQUOTA);
sb->s_grp_quota_inum = EXT4_GRP_QUOTA_INO;