X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fquota.c;h=f9b68c9d9cb9387ecb1f3d77c651fea3e51392b1;hb=a81ea1283104cc331d47f0f0a75b29a081af2a7c;hp=53b695b9d70a159fad17e3cf290f7d985168e35f;hpb=a86d55da8bf41335aa2fc5ec16ca63859d918e81;p=tools%2Fe2fsprogs.git

diff --git a/e2fsck/quota.c b/e2fsck/quota.c
index 53b695b..f9b68c9 100644
--- a/e2fsck/quota.c
+++ b/e2fsck/quota.c
@@ -15,32 +15,55 @@
 
 #include "e2fsck.h"
 #include "problem.h"
-#include "quota/mkquota.h"
 
-static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino,
-			     ext2_ino_t to_ino, int qtype)
+static errcode_t move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino,
+				  ext2_ino_t to_ino, enum quota_type qtype)
 {
-	struct ext2_super_block *sb = fs->super;
-	ext2_ino_t		ino;
 	struct ext2_inode	inode;
 	errcode_t		retval;
-	char			qf_name[255];
+	char			qf_name[QUOTA_NAME_LEN];
 
-	if (ext2fs_read_inode(fs, from_ino, &inode))
-		return;
+	/* We need the inode bitmap to be loaded */
+	retval = ext2fs_read_bitmaps(fs);
+	if (retval) {
+		com_err("ext2fs_read_bitmaps", retval, "%s",
+			_("in move_quota_inode"));
+		return retval;
+	}
+
+	retval = ext2fs_read_inode(fs, from_ino, &inode);
+	if (retval) {
+		com_err("ext2fs_read_inode", retval, "%s",
+			_("in move_quota_inode"));
+		return retval;
+	}
 
 	inode.i_links_count = 1;
 	inode.i_mode = LINUX_S_IFREG | 0600;
 	inode.i_flags = EXT2_IMMUTABLE_FL;
-	if (fs->super->s_feature_incompat &
-			EXT3_FEATURE_INCOMPAT_EXTENTS)
+	if (ext2fs_has_feature_extents(fs->super))
 		inode.i_flags |= EXT4_EXTENTS_FL;
 
-	ext2fs_write_new_inode(fs, to_ino, &inode);
+	retval = ext2fs_write_new_inode(fs, to_ino, &inode);
+	if (retval) {
+		com_err("ext2fs_write_new_inode", retval, "%s",
+			_("in move_quota_inode"));
+		return retval;
+	}
+
 	/* unlink the old inode */
 	quota_get_qf_name(qtype, QFMT_VFS_V1, qf_name);
-	ext2fs_unlink(fs, EXT2_ROOT_INO, qf_name, from_ino, 0);
+	retval = ext2fs_unlink(fs, EXT2_ROOT_INO, qf_name, from_ino, 0);
+	if (retval) {
+		com_err("ext2fs_unlink", retval, "%s",
+			_("in move_quota_inode"));
+		return retval;
+	}
 	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);
+	return 0;
 }
 
 void e2fsck_hide_quota(e2fsck_t ctx)
@@ -48,42 +71,57 @@ void e2fsck_hide_quota(e2fsck_t ctx)
 	struct ext2_super_block *sb = ctx->fs->super;
 	struct problem_context	pctx;
 	ext2_filsys		fs = ctx->fs;
+	enum quota_type qtype;
+	ext2_ino_t quota_ino;
 
 	clear_problem_context(&pctx);
 
 	if ((ctx->options & E2F_OPT_READONLY) ||
-	    !(sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA))
-		return;
-
-	/* We need the inode bitmap to be loaded */
-	if (ext2fs_read_bitmaps(fs))
+	    !ext2fs_has_feature_quota(sb))
 		return;
 
-	if (!sb->s_usr_quota_inum && !sb->s_grp_quota_inum)
-		/* nothing to do */
-		return;
+	for (qtype = 0; qtype < MAXQUOTAS; qtype++) {
+		pctx.dir = 2;	/* This is a guess, but it's a good one */
+		pctx.ino = *quota_sb_inump(sb, qtype);
+		pctx.num = qtype;
+		quota_ino = quota_type2inum(qtype, fs->super);
+		if (pctx.ino && (pctx.ino != quota_ino) &&
+		    fix_problem(ctx, PR_0_HIDE_QUOTA, &pctx)) {
+			if (move_quota_inode(fs, pctx.ino, quota_ino, qtype))
+				continue;
+			*quota_sb_inump(sb, qtype) = quota_ino;
+			ext2fs_mark_super_dirty(fs);
+		}
+	}
 
-	if (sb->s_usr_quota_inum == EXT4_USR_QUOTA_INO &&
-	    sb->s_grp_quota_inum == EXT4_GRP_QUOTA_INO)
-		/* nothing to do */
-		return;
+	return;
+}
 
-	if (!fix_problem(ctx, PR_0_HIDE_QUOTA, &pctx))
-		return;
+void e2fsck_validate_quota_inodes(e2fsck_t ctx)
+{
+	struct ext2_super_block *sb = ctx->fs->super;
+	struct problem_context	pctx;
+	ext2_filsys		fs = ctx->fs;
+	enum quota_type qtype;
 
-	if (sb->s_usr_quota_inum &&
-	    sb->s_usr_quota_inum != EXT4_USR_QUOTA_INO) {
-		move_quota_inode(fs, sb->s_usr_quota_inum, EXT4_USR_QUOTA_INO,
-				 USRQUOTA);
-		sb->s_usr_quota_inum = EXT4_USR_QUOTA_INO;
-	}
+	clear_problem_context(&pctx);
 
-	if (sb->s_grp_quota_inum &&
-	    sb->s_grp_quota_inum != EXT4_GRP_QUOTA_INO) {
-		move_quota_inode(fs, sb->s_grp_quota_inum, EXT4_GRP_QUOTA_INO,
-				 GRPQUOTA);
-		sb->s_grp_quota_inum = EXT4_GRP_QUOTA_INO;
+	for (qtype = 0; qtype < MAXQUOTAS; qtype++) {
+		pctx.ino = *quota_sb_inump(sb, qtype);
+		pctx.num = qtype;
+		if (pctx.ino &&
+		    ((pctx.ino == EXT2_BAD_INO) ||
+		     (pctx.ino == EXT2_ROOT_INO) ||
+		     (pctx.ino == EXT2_BOOT_LOADER_INO) ||
+		     (pctx.ino == EXT2_UNDEL_DIR_INO) ||
+		     (pctx.ino == EXT2_RESIZE_INO) ||
+		     (pctx.ino == EXT2_JOURNAL_INO) ||
+		     (pctx.ino == EXT2_EXCLUDE_INO) ||
+		     (pctx.ino == EXT4_REPLICA_INO) ||
+		     (pctx.ino > fs->super->s_inodes_count)) &&
+		    fix_problem(ctx, PR_0_INVALID_QUOTA_INO, &pctx)) {
+			*quota_sb_inump(sb, qtype) = 0;
+			ext2fs_mark_super_dirty(fs);
+		}
 	}
-
-	return;
 }