[PATCH 0/8 v2] Quota fixes for e2fsprogs

[PATCH 0/8 v2] Quota fixes for e2fsprogs

[Jan Kara]

Hello,

here is next revision of my quota fixes for e2fsprogs. When addressing the
e2fsck regression Ted has pointed out, I've noticed another serious bug in
e2fsck support for quotas where it just nukes existing quota limits when
replaying orphan list. A fix is now included in this series together with
expanded test to catch the problem.

Changes since v1:
* Rename the functions so that names match functionality
* Fix e2fsck regression when processing orphan list
* Fix e2fsck bug to preserve quota limits over orphan processing
* Expand test to verify quota limits are properly preserved
* Fix quota output headings in debugfs

								Honza

[PATCH 1/8] quota: Add support to version 0 quota format

[Jan Kara]

Version 0 quota format differs from version 1 by having only 32-bit
counters for inodes and block limits. For many installations this is not
limiting and thus the format is widely used. Also quota tools still
create quota files with this format by default. Add support for this
quota format to e2fsprogs so that we can seamlessly convert quota files
in this format into our internal quota files.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 lib/support/quotaio_v2.c | 85 +++++++++++++++++++++++++++++++++++++---
 lib/support/quotaio_v2.h | 17 +++++++-
 2 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/lib/support/quotaio_v2.c b/lib/support/quotaio_v2.c
index 23717f03f428..a49aa6ac8c2f 100644
--- a/lib/support/quotaio_v2.c
+++ b/lib/support/quotaio_v2.c
@@ -41,6 +41,68 @@ struct quotafile_ops quotafile_ops_2 = {
 	.report		= v2_report,
 };
 
+/*
+ * Copy dquot from disk to memory
+ */
+static void v2r0_disk2memdqblk(struct dquot *dquot, void *dp)
+{
+	struct util_dqblk *m = &dquot->dq_dqb;
+	struct v2r0_disk_dqblk *d = dp, empty;
+
+	dquot->dq_id = ext2fs_le32_to_cpu(d->dqb_id);
+	m->dqb_ihardlimit = ext2fs_le32_to_cpu(d->dqb_ihardlimit);
+	m->dqb_isoftlimit = ext2fs_le32_to_cpu(d->dqb_isoftlimit);
+	m->dqb_bhardlimit = ext2fs_le32_to_cpu(d->dqb_bhardlimit);
+	m->dqb_bsoftlimit = ext2fs_le32_to_cpu(d->dqb_bsoftlimit);
+	m->dqb_curinodes = ext2fs_le32_to_cpu(d->dqb_curinodes);
+	m->dqb_curspace = ext2fs_le64_to_cpu(d->dqb_curspace);
+	m->dqb_itime = ext2fs_le64_to_cpu(d->dqb_itime);
+	m->dqb_btime = ext2fs_le64_to_cpu(d->dqb_btime);
+
+	memset(&empty, 0, sizeof(struct v2r0_disk_dqblk));
+	empty.dqb_itime = ext2fs_cpu_to_le64(1);
+	if (!memcmp(&empty, dp, sizeof(struct v2r0_disk_dqblk)))
+		m->dqb_itime = 0;
+}
+
+/*
+ * Copy dquot from memory to disk
+ */
+static void v2r0_mem2diskdqblk(void *dp, struct dquot *dquot)
+{
+	struct util_dqblk *m = &dquot->dq_dqb;
+	struct v2r0_disk_dqblk *d = dp;
+
+	d->dqb_ihardlimit = ext2fs_cpu_to_le32(m->dqb_ihardlimit);
+	d->dqb_isoftlimit = ext2fs_cpu_to_le32(m->dqb_isoftlimit);
+	d->dqb_bhardlimit = ext2fs_cpu_to_le32(m->dqb_bhardlimit);
+	d->dqb_bsoftlimit = ext2fs_cpu_to_le32(m->dqb_bsoftlimit);
+	d->dqb_curinodes = ext2fs_cpu_to_le32(m->dqb_curinodes);
+	d->dqb_curspace = ext2fs_cpu_to_le64(m->dqb_curspace);
+	d->dqb_itime = ext2fs_cpu_to_le64(m->dqb_itime);
+	d->dqb_btime = ext2fs_cpu_to_le64(m->dqb_btime);
+	d->dqb_id = ext2fs_cpu_to_le32(dquot->dq_id);
+	if (qtree_entry_unused(&dquot->dq_h->qh_info.u.v2_mdqi.dqi_qtree, dp))
+		d->dqb_itime = ext2fs_cpu_to_le64(1);
+}
+
+static int v2r0_is_id(void *dp, struct dquot *dquot)
+{
+	struct v2r0_disk_dqblk *d = dp;
+	struct qtree_mem_dqinfo *info =
+			&dquot->dq_h->qh_info.u.v2_mdqi.dqi_qtree;
+
+	if (qtree_entry_unused(info, dp))
+		return 0;
+	return ext2fs_le32_to_cpu(d->dqb_id) == dquot->dq_id;
+}
+
+static struct qtree_fmt_operations v2r0_fmt_ops = {
+	.mem2disk_dqblk = v2r0_mem2diskdqblk,
+	.disk2mem_dqblk = v2r0_disk2memdqblk,
+	.is_id = v2r0_is_id,
+};
+
 /*
  * Copy dquot from disk to memory
  */
@@ -164,7 +226,8 @@ static int v2_check_file(struct quota_handle *h, int type, int fmt)
 		log_err("Your quota file is stored in wrong endianity");
 		return 0;
 	}
-	if (V2_VERSION != ext2fs_le32_to_cpu(dqh.dqh_version))
+	if (V2_VERSION_R0 != ext2fs_le32_to_cpu(dqh.dqh_version) &&
+	    V2_VERSION_R1 != ext2fs_le32_to_cpu(dqh.dqh_version))
 		return 0;
 	return 1;
 }
@@ -174,13 +237,25 @@ static int v2_check_file(struct quota_handle *h, int type, int fmt)
  */
 static int v2_init_io(struct quota_handle *h)
 {
+	struct v2_disk_dqheader dqh;
 	struct v2_disk_dqinfo ddqinfo;
 	struct v2_mem_dqinfo *info;
 	__u64 filesize;
+	int version;
 
-	h->qh_info.u.v2_mdqi.dqi_qtree.dqi_entry_size =
-		sizeof(struct v2r1_disk_dqblk);
-	h->qh_info.u.v2_mdqi.dqi_qtree.dqi_ops = &v2r1_fmt_ops;
+	if (!v2_read_header(h, &dqh))
+		return -1;
+	version = ext2fs_le32_to_cpu(dqh.dqh_version);
+
+	if (version == V2_VERSION_R0) {
+		h->qh_info.u.v2_mdqi.dqi_qtree.dqi_entry_size =
+			sizeof(struct v2r0_disk_dqblk);
+		h->qh_info.u.v2_mdqi.dqi_qtree.dqi_ops = &v2r0_fmt_ops;
+	} else {
+		h->qh_info.u.v2_mdqi.dqi_qtree.dqi_entry_size =
+			sizeof(struct v2r1_disk_dqblk);
+		h->qh_info.u.v2_mdqi.dqi_qtree.dqi_ops = &v2r1_fmt_ops;
+	}
 
 	/* Read information about quotafile */
 	if (h->e2fs_read(&h->qh_qf, V2_DQINFOOFF, &ddqinfo,
@@ -231,7 +306,7 @@ static int v2_new_io(struct quota_handle *h)
 
 	/* Write basic quota header */
 	ddqheader.dqh_magic = ext2fs_cpu_to_le32(file_magics[h->qh_type]);
-	ddqheader.dqh_version = ext2fs_cpu_to_le32(V2_VERSION);
+	ddqheader.dqh_version = ext2fs_cpu_to_le32(V2_VERSION_R1);
 	if (h->e2fs_write(&h->qh_qf, 0, &ddqheader, sizeof(ddqheader)) !=
 			sizeof(ddqheader))
 		return -1;
diff --git a/lib/support/quotaio_v2.h b/lib/support/quotaio_v2.h
index de2db2785cb0..35054cafaa23 100644
--- a/lib/support/quotaio_v2.h
+++ b/lib/support/quotaio_v2.h
@@ -13,7 +13,8 @@
 /* Offset of info header in file */
 #define V2_DQINFOOFF		sizeof(struct v2_disk_dqheader)
 /* Supported version of quota-tree format */
-#define V2_VERSION 1
+#define V2_VERSION_R1 1
+#define V2_VERSION_R0 0
 
 struct v2_disk_dqheader {
 	__le32 dqh_magic;	/* Magic number identifying file */
@@ -36,6 +37,20 @@ struct v2_disk_dqinfo {
 					 * free entry */
 } __attribute__ ((packed));
 
+struct v2r0_disk_dqblk {
+	__le32 dqb_id;	/* id this quota applies to */
+	__le32 dqb_ihardlimit;	/* absolute limit on allocated inodes */
+	__le32 dqb_isoftlimit;	/* preferred inode limit */
+	__le32 dqb_curinodes;	/* current # allocated inodes */
+	__le32 dqb_bhardlimit;	/* absolute limit on disk space
+					 * (in QUOTABLOCK_SIZE) */
+	__le32 dqb_bsoftlimit;	/* preferred limit on disk space
+					 * (in QUOTABLOCK_SIZE) */
+	__le64 dqb_curspace;	/* current space occupied (in bytes) */
+	__le64 dqb_btime;	/* time limit for excessive disk use */
+	__le64 dqb_itime;	/* time limit for excessive inode use */
+} __attribute__ ((packed));
+
 struct v2r1_disk_dqblk {
 	__le32 dqb_id;	/* id this quota applies to */
 	__le32 dqb_pad;
-- 
2.26.2

[PATCH 2/8] quota: Fold quota_read_all_dquots() into quota_update_limits()

[Jan Kara]

There's just one caller of quota_read_all_dquots(), fold it into its
caller quota_update_limits(). No functional changes.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 lib/support/mkquota.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
index fbc3833aee98..8e5c61a601cc 100644
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@@ -564,23 +564,6 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data)
 	return 0;
 }
 
-/*
- * Read all dquots from quota file into memory
- */
-static errcode_t quota_read_all_dquots(struct quota_handle *qh,
-                                       quota_ctx_t qctx,
-				       int update_limits EXT2FS_ATTR((unused)))
-{
-	struct scan_dquots_data scan_data;
-
-	scan_data.quota_dict = qctx->quota_dict[qh->qh_type];
-	scan_data.check_consistency = 0;
-	scan_data.update_limits = 0;
-	scan_data.update_usage = 1;
-
-	return qh->qh_ops->scan_dquots(qh, scan_dquots_callback, &scan_data);
-}
-
 /*
  * Write all memory dquots into quota file
  */
@@ -607,6 +590,7 @@ static errcode_t quota_write_all_dquots(struct quota_handle *qh,
 errcode_t quota_update_limits(quota_ctx_t qctx, ext2_ino_t qf_ino,
 			      enum quota_type qtype)
 {
+	struct scan_dquots_data scan_data;
 	struct quota_handle *qh;
 	errcode_t err;
 
@@ -625,7 +609,11 @@ errcode_t quota_update_limits(quota_ctx_t qctx, ext2_ino_t qf_ino,
 		goto out;
 	}
 
-	quota_read_all_dquots(qh, qctx, 1);
+	scan_data.quota_dict = qctx->quota_dict[qh->qh_type];
+	scan_data.check_consistency = 0;
+	scan_data.update_limits = 0;
+	scan_data.update_usage = 1;
+	qh->qh_ops->scan_dquots(qh, scan_dquots_callback, &scan_data);
 
 	err = quota_file_close(qctx, qh);
 	if (err) {
-- 
2.26.2

[PATCH 3/8] quota: Rename quota_update_limits() to quota_read_all_dquots()

[Jan Kara]

quota_update_limits() is a misnomer because what it actually does is
that it updates 'usage' counters and leaves 'limit' counters intact.
Rename quota_update_limits() to quota_read_all_dquots() and while
changing prototype also add a flags argument so that callers can control
which quota information is actually updated from the disk.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 e2fsck/super.c        |  3 ++-
 lib/support/mkquota.c | 11 ++++++-----
 lib/support/quotaio.h |  7 +++++--
 misc/tune2fs.c        |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/e2fsck/super.c b/e2fsck/super.c
index e1c3f93572f4..75b7b8ffa9b6 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -281,7 +281,8 @@ static errcode_t e2fsck_read_all_quotas(e2fsck_t ctx)
 		if (qf_ino == 0)
 			continue;
 
-		retval = quota_update_limits(ctx->qctx, qf_ino, qtype);
+		retval = quota_read_all_dquots(ctx->qctx, qf_ino, qtype,
+					       QREAD_USAGE);
 		if (retval)
 			break;
 	}
diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
index 8e5c61a601cc..0fefca90c843 100644
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@@ -585,10 +585,11 @@ static errcode_t quota_write_all_dquots(struct quota_handle *qh,
 #endif
 
 /*
- * Updates the in-memory quota limits from the given quota inode.
+ * Read quotas from disk and updates the in-memory information determined by
+ * 'flags' from the on-disk data.
  */
-errcode_t quota_update_limits(quota_ctx_t qctx, ext2_ino_t qf_ino,
-			      enum quota_type qtype)
+errcode_t quota_read_all_dquots(quota_ctx_t qctx, ext2_ino_t qf_ino,
+				enum quota_type qtype, unsigned int flags)
 {
 	struct scan_dquots_data scan_data;
 	struct quota_handle *qh;
@@ -611,8 +612,8 @@ errcode_t quota_update_limits(quota_ctx_t qctx, ext2_ino_t qf_ino,
 
 	scan_data.quota_dict = qctx->quota_dict[qh->qh_type];
 	scan_data.check_consistency = 0;
-	scan_data.update_limits = 0;
-	scan_data.update_usage = 1;
+	scan_data.update_limits = !!(flags & QREAD_LIMITS);
+	scan_data.update_usage = !!(flags & QREAD_USAGE);
 	qh->qh_ops->scan_dquots(qh, scan_dquots_callback, &scan_data);
 
 	err = quota_file_close(qctx, qh);
diff --git a/lib/support/quotaio.h b/lib/support/quotaio.h
index 6068970009f5..84fac35dda20 100644
--- a/lib/support/quotaio.h
+++ b/lib/support/quotaio.h
@@ -224,8 +224,11 @@ void quota_data_add(quota_ctx_t qctx, struct ext2_inode_large *inode,
 void quota_data_sub(quota_ctx_t qctx, struct ext2_inode_large *inode,
 		    ext2_ino_t ino, qsize_t space);
 errcode_t quota_write_inode(quota_ctx_t qctx, enum quota_type qtype);
-errcode_t quota_update_limits(quota_ctx_t qctx, ext2_ino_t qf_ino,
-			      enum quota_type type);
+/* Flags for quota_read_all_dquots() */
+#define QREAD_USAGE  0x01
+#define QREAD_LIMITS 0x02
+errcode_t quota_read_all_dquots(quota_ctx_t qctx, ext2_ino_t qf_ino,
+				enum quota_type type, unsigned int flags);
 errcode_t quota_compute_usage(quota_ctx_t qctx);
 void quota_release_context(quota_ctx_t *qctx);
 errcode_t quota_remove_inode(ext2_filsys fs, enum quota_type qtype);
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index f739f16cd62b..bb08f8026918 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1671,8 +1671,9 @@ static int handle_quota_options(ext2_filsys fs)
 		if (quota_enable[qtype] == QOPT_ENABLE &&
 		    *quota_sb_inump(fs->super, qtype) == 0) {
 			if ((qf_ino = quota_file_exists(fs, qtype)) > 0) {
-				retval = quota_update_limits(qctx, qf_ino,
-							     qtype);
+				retval = quota_read_all_dquots(qctx, qf_ino,
+							       qtype,
+							       QREAD_USAGE);
 				if (retval) {
 					com_err(program_name, retval,
 						_("while updating quota limits (%d)"),
-- 
2.26.2

[PATCH 4/8] tune2fs: Fix conversion of quota files

[Jan Kara]

When tune2fs is enabling quota feature, it looks for old-style quota
files and tries to transfer limits stored in these files into newly
created hidded quota files. However the code doing the transfer setups
the quota scan wrongly and instead of transferring limits we transfer
usage. So not only quota limits are lost (at least they can still be
recovered from the old quota files) but also usage information may be
wrong if the accounting in e2fsprogs does not exactly match the
accounting in quota-tools (which is actually the case). Fix the setup of
the quota scan.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 misc/tune2fs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index bb08f8026918..0f6ef3d6df6b 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1673,7 +1673,7 @@ static int handle_quota_options(ext2_filsys fs)
 			if ((qf_ino = quota_file_exists(fs, qtype)) > 0) {
 				retval = quota_read_all_dquots(qctx, qf_ino,
 							       qtype,
-							       QREAD_USAGE);
+							       QREAD_LIMITS);
 				if (retval) {
 					com_err(program_name, retval,
 						_("while updating quota limits (%d)"),
-- 
2.26.2

[PATCH 5/8] e2fsck: Do not trash user limits when processing orphan list

[Jan Kara]

When e2fsck was loading quotas to process orphan list, it was loading
only quota usage. However subsequent quota writeout has effectively
overwritten quota limits, loosing them forever. Make sure quota limits
are preserved over orphan replay.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 e2fsck/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2fsck/super.c b/e2fsck/super.c
index 75b7b8ffa9b6..4ffafb211e50 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -282,7 +282,7 @@ static errcode_t e2fsck_read_all_quotas(e2fsck_t ctx)
 			continue;
 
 		retval = quota_read_all_dquots(ctx->qctx, qf_ino, qtype,
-					       QREAD_USAGE);
+					       QREAD_USAGE | QREAD_LIMITS);
 		if (retval)
 			break;
 	}
-- 
2.26.2

[PATCH 6/8] tests: Expand test checking quota and orphan processing interaction

[Jan Kara]

Expand f_orphquot test to also check handling of quotas for non-root
user and verify that quota limits are properly preserved over orphan
replay.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 tests/f_orphquot/expect    |   8 +++++++-
 tests/f_orphquot/image.bz2 | Bin 1327 -> 2083 bytes
 tests/f_orphquot/script    |   2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/f_orphquot/expect b/tests/f_orphquot/expect
index 90a78130b6a9..f1f0b446c5d1 100644
--- a/tests/f_orphquot/expect
+++ b/tests/f_orphquot/expect
@@ -1,4 +1,4 @@
-Clearing orphaned inode 12 (uid=0, gid=0, mode=0100644, size=3842048)
+Clearing orphaned inode 12 (uid=1000, gid=100, mode=0100644, size=3145728)
 Pass 1: Checking inodes, blocks, and sizes
 Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
@@ -8,3 +8,9 @@ Pass 5: Checking group summary information
 test_filesystem: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesystem: 11/512 files (9.1% non-contiguous), 1070/2048 blocks
 Exit status is 0
+   user id      blocks   quota    limit      inodes    quota    limit
+         0      20480        0        0           2        0        0
+      1000          0     5000     6000           0       50       60
+  group id      blocks   quota    limit      inodes    quota    limit
+         0      20480        0        0           2        0        0
+       100          0     6000     7000           0       60       70
diff --git a/tests/f_orphquot/image.bz2 b/tests/f_orphquot/image.bz2
index 44c831852b0740019705c1ffbafa3d37cc561da8..7ac17a0ffc88519616eff6cd18822897eee93cd4 100644
GIT binary patch
literal 2083
zcmc(V`#;l-0>{5LHq&MsmNoZbHsl$WOR;81$z`NMEjFr2oJzt{W|>RmRy5aVa*K7L
zhn=NPE|F4WRGyv?a+gA_5|vZGoPXhbetN$??>9Y|<7n*?MA#GL1nesXl**IV|F=)?
z))&_oN7g@|A6@_1%K7?RtgZhTgRW};000tTb_MvuhysMKU*!wJXRsl>ysj8sBcwoz
zz%;oRtSJlKO#T(h0dFiIx8Vpmno1PKB~eFt29NSMxuViV1mJ#o1Vs)2lwSaF5EKf8
z_xt-T5CE7Kk^BGZ@cslo!E4uBP&qoUD*Q`L-YP29qekRxcDdiz?YSbC<4kxV=Wf}A
z<AnE%xZYK4gbtkoB)Etu&j(m_8S_!DY*<EhT>GJvlUYOO3XfQJ2{)BJe%)Eb3e{@P
z@bmK2uRZSn*9NrH^hCP7AjYMSH*HPNbQ5Dc25`p3TaFI&V!w_HEuAw&@a5tL@&(G#
zrc_w{;+>emXYpZKsun49QEnGwK2yF~DrG;s*mVy2G9{!-jZjXKzhfrErtzyX7O*=|
zz%6t%CU*<i00OVi1v!uDn~9kpAWt*E<?XGf89Z6g9Qh3;j1z@?qB`E-h^_>}=tffg
zD{&Kn`|@{;Xrw5HV5EQ@=)9{+BKc|KUc}BcGD?b85xKc#snfpS?{#N!*fd$ms{r0T
zGZ6n?h_OY<P2jj?Wqm%N9x&RMp;%%1hGa}-{hQ#j+C21Z1AUf#&79py^K*a5OFo;!
z;T_Ynovo))5+%zV(Z|Bmjw4ZH)ncYf-R+hlA?wZ=BmOZ*5SEBo8K;`=ygT&rDpZ*i
z0anYO3aD1`vh2mwce70kRA?sE8c!`QU(tA3b@f13eZFT`W#c8#-ol>SFzsjuL%Ej)
z%f*&WUqHWrY1t%CN`<5QZ+uRUiaoqSwf3(l!aA@pu2dAU%O)KHEX?NB^G0khX~WZX
z{Qj8LHi`_4cc-cGfCRFuiz2S*`<poMV=13dba65wn3zohxr5+P-RbUDeeqW3{bv-+
z&<~l5Kq3OnQ#!aY&1BTnebX&fVz4TLPJ4Nw8K-grOhp4yv|Ea!gEgLFXjC1HOEskv
z>%}MVfz}eN0;a=K21!->GdbxP^1il0pkwKZCpbu1qoM@?Y2;V*x6xPd6%1>%6`WxO
zha@XQ;3&0rK5Qo{)M_^<*BHo$$2v6$(8us_-lbUvJHmT2t}^~2-dxPNpWu>$QQ=xA
zKba4o@+LtVk)gw+_}IMxnj*N?0Z+^#pL%EmZINA(g3*fZiHxVzdF?DSG+2|s$?HC<
zf!g0EiDfmAXi>FO$hml(Lv;@NTIT*sAvx{l4BI7KM?>XPvO`5NQIJ3D;qyBF8b`Th
zOUOq2vRvu!>|u^QI|hQ4SAxlTD`?lXKHK+;u5L4y&5uq}bfu9O1m&{wQOFHSr;(qu
zpgeV|4rPvYCcAl;dZrQ$dd^s8A<YUzqZwL#XdO0sD@`;5x*;Se!IZBjKORgdAc;TD
zN_zK-N=uEb^^-btSH#=e_`b#R<~zxJ5*7zKa>56c^j<^fjSJTfdGvJ8gK3FJq@>fT
zM4khI$=*ZwiBW>>M#^hscud-2qO3MN5IML#3OLoFin}%E5VmL4`3LG96Q3xzt72)O
zc5NhE=m|A%!oIqeE<SAdCl1WIKR7#Ypi9(0Kle$3D+#;ze)TxD?SX3eciW@6=volR
zYX)S!^ax41WEhH^8(tqHWIp$xjEO=@WMUb<N9j;gC^SKjp}gNFObcnyy!8B*&*U)F
zYGZeWs{O--XN{tFh!s{&!rO!DTx1I-8Cq+woqt8?ky`r(dP{VxY;14q>tV-~E*oZS
z;?GR|MT8T%^``=q3A&Dk-l?_JWOLyqk%H{#`fZO|(|4K##@NRjWAr-ptLCAa9>PI%
zZ@74kmmzmQZs-)77Oo57(aNv!%v=<h+*7;KJ>7(j*#;{zE%ez^k3xCt_>;qHo7KKN
z>Bqd4{^7R&v3B>_2Q$}aWSv6~)L3D(#&M`rea`9mxoZ-t-Hy^z-LZ2E%I$`@<#(3{
zUTkYrM=9nCo%X3>vpYvrG#9-mZZmhxw|{|jkh4gGnyINN^~U|XO^`RK>9O1TKI5ls
za;`F6d*nRk6j`*4q0Tf9r59DYPWN&@wyK3kyoJDK=08lTCpGB~*2aF}4;4(RePg&E
z{j}X)pUOC&2P(!MS)&V2F)>TtA@kV7*qnRc{>1nrCMNO*4w&|!%1)8N(v`6|t5wKS
z-8P94;+47X>cP}+^W%nn7CCc97q?n2H?*JW?~l59<MLGFot!Rnv#(bxoDvAT8_M+D
zBApiwOru(;yP$0M??#QjPp~5~Z)%E{9R>SN2IB=fQK`Fq$lU|;qF$$*6w60I4Y%jG
zfHofF#*>5x4Hf!SwC621Zql*yjXKm=jf5oW7ZD@Qa-B<KC!p-4*Mv05>I{}K@vls~
z3*fp@4k@td&xta$DN&0y^Ovn=+Li)?Ufn_#7o#^Eq=<A4s;+6t$-aOLAyI<utWC6C
z>ULkbaqNvp^e~CYebMyyrXNXnty1kPXbG>(`St&?61hA1dEPCPMIZYN7GDI1x&!Ap
a|3pSH@Zn`&x2`Y8nd}k3z-=lKZT|&i{Dmw4

literal 1327
zcmV+~1<?9JT4*^jL0KkKSs|BC`v3sQfB*me|MuJ8ynp=vTV5~!@7a2^Ud_+_UmRWU
z)g`^x-rUdx{s27y6r)uTWhBxv8YYiMqY06t69AfR383_vFq&l07$azD7-RwgnkEQj
zG{nI)7||Y~<qa^#p#TFwXwyc3(-2_*$jE3kG{OuM6G5N`fB;~c1__X18VrV-VKQO>
zXg~na8Z^<MG{hJ{GBO$s4KRZQ#L#E~pa2*qfr4ZhMuQ=ym`s>}8U|8G00004z$O3y
z044%334j3500004!fB%+r=TVP002c2OoE=KN2!uz$l4&tVjiPRnKBvyqaX}`(?Osb
zX{LiiMuvbI00ThDrkI9-gsStIa}90{i-o$^7K0&Fnl9v$_;F03eab6_f5x#K3=KaF
zQ*~*u%QiQ&Qe^9>Ziq-jW<+WByf<$9k6!f8P~E+8+J^C$TbAECr+Q!unGTl)FSayf
zd4mzQ(W!iAD$TM%gJAb=^|Tg6pp0z^MJ<g}0nR#xfEF+a8WJ?P^3WmAz=&sl>Zp}M
z1J<xAZQ<8_9rMs+&a$xuAG#0_P*&t9f;V#vpc%6;U??k#S1Y+FE2QgnS1fYT8S7^g
zBp!o#Qp<KX%!Jwp1=?XYHWjG^AR1A)$fR<^1%W^%#fDbU!fTtuBT<wZ=s3dxrx@4a
zk~!Q$;LsBD0eyu70}PRIjTr+jwo(c*w+rNf)eYG>cvVyY18apMiIyk;CoH8RNGpg0
zAfO#HnNBxN;}K4G%$Qds2I7IBU_&6n&|q=LNaHxIL!4n-3NnK7D+rdz1poj7+YMn`
zDQF;2p#n0%jbu~}V+@Ki*fP<9LstkF7*(Lc2T20mVH<1=u&WFRLkfkVg>&pR)gZ9K
zx5!yx1%^2i6+i$0lBbAqGtI4FMl%5{A*d?8(UYiniqs~V`5gmccz_%3*oI0FhE^Y^
zf=$*6?1_B)*(yI?9!zK-mYBF+YEZ+4pineT4oo3ze#iM90hJqVVupqAU5iJSgu`LN
zV~q%9&HVncsrB4Kii9xstOGE?02!?5xFDl;FN`hog)Oup<k@R~9_G;T;0lO%Fv0&y
zl|!>9HHOqYC;XQXfubk_YG6Q#l1RKVbf!O&f?0|I>j>Z<WQ?IfEN_Vkrvp9I4rT$<
zupzhzFyIZdwr6(1%x6Px(0TU@z-Z1sWFey=$}(Vb{2%S8J;-#sl;Vc@>_eUk!0*UG
z0q`KG-U56NoMHGF<x>n$Rtk<~qL`^DECnE8gi$Q8>RDhNJ3$I7t;W?+<wI~*QQAn$
zec)_x9f);??cBD*B3uJ=f%Kc>fA|1#AW`;+cz1PgL<c_LbtWHD!<ju6U85cTN<b}_
z84bCkU_J7gz1GR+fS~vslYDw$r;uWwBy~%JpaW#gbCcFSa2J|9<4AUtR#$kyX%OE%
zpmk_)*niG9a2ovpUw8qEJRs@Ao^yeK`H2UhI&?Bif*SLrj~TFW7zgGw_DtDNq&vRA
z3zQUo!c35fgM3P%1qz6yl1WK+TzB?vz3T*i?DK!%Jg;9z2^K5Ah5)+ekO(xv+a-VW
zeZX$t9!Hq`dIkLV;EM91Z#HojfUyDc21ijMu;+l#GbyvuEQ<n}co1Fy^sg$0#uHPW
zav_IDum+0I?Evsf6ajH!RRt+h1xLvetpkQRC8Zn2Y7Ysm_7Nf28~IGx$G}qr4srwl
l006WK!?Gmje3DTDrUU@rg;??e)@;xGUC9*TLO_OHKkO*@K@b1{

diff --git a/tests/f_orphquot/script b/tests/f_orphquot/script
index acdf5670c500..e17bff0c1667 100644
--- a/tests/f_orphquot/script
+++ b/tests/f_orphquot/script
@@ -8,6 +8,8 @@ rm -rf $OUT
 $FSCK -f -y -N test_filesystem $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
+$DEBUGFS -R 'lq user' $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -R 'lq group' $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
-- 
2.26.2

[PATCH 7/8] debugfs: Fix headers for quota commands

[Jan Kara]

list_quota and get_quota commands have 'blocks' header while what they
actually show is a used space in bytes. Fix the header to state 'space'
instead.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 debugfs/quota.c         |  4 ++--
 tests/f_orphquot/expect |  4 ++--
 tests/f_quota/expect.0  | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debugfs/quota.c b/debugfs/quota.c
index f792bd738781..1da1e03c6d88 100644
--- a/debugfs/quota.c
+++ b/debugfs/quota.c
@@ -123,7 +123,7 @@ void do_list_quota(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 
 	printf("%7s %2s   %8s %8s %8s    %8s %8s %8s\n",
 	       quota_type[type], "id",
-	       "blocks", "quota", "limit", "inodes", "quota", "limit");
+	       "space", "quota", "limit", "inodes", "quota", "limit");
 	qh = current_qctx->quota_file[type];
 	retval = qh->qh_ops->scan_dquots(qh, list_quota_callback, NULL);
 	if (retval) {
@@ -158,7 +158,7 @@ void do_get_quota(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 
 	printf("%7s %2s   %8s %8s %8s    %8s %8s %8s\n",
 	       quota_type[type], "id",
-	       "blocks", "quota", "limit", "inodes", "quota", "limit");
+	       "space", "quota", "limit", "inodes", "quota", "limit");
 
 	qh = current_qctx->quota_file[type];
 
diff --git a/tests/f_orphquot/expect b/tests/f_orphquot/expect
index f1f0b446c5d1..0f75decd16bd 100644
--- a/tests/f_orphquot/expect
+++ b/tests/f_orphquot/expect
@@ -8,9 +8,9 @@ Pass 5: Checking group summary information
 test_filesystem: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesystem: 11/512 files (9.1% non-contiguous), 1070/2048 blocks
 Exit status is 0
-   user id      blocks   quota    limit      inodes    quota    limit
+   user id      space    quota    limit      inodes    quota    limit
          0      20480        0        0           2        0        0
       1000          0     5000     6000           0       50       60
-  group id      blocks   quota    limit      inodes    quota    limit
+  group id      space    quota    limit      inodes    quota    limit
          0      20480        0        0           2        0        0
        100          0     6000     7000           0       60       70
diff --git a/tests/f_quota/expect.0 b/tests/f_quota/expect.0
index eb5294ee2288..26454856699d 100644
--- a/tests/f_quota/expect.0
+++ b/tests/f_quota/expect.0
@@ -1,21 +1,21 @@
 debugfs: list_quota user
-   user id     blocks    quota    limit      inodes    quota    limit
+   user id      space    quota    limit      inodes    quota    limit
          0      13312        0        0           2        0        0
         34       1024        0        0           1        0        0
        100       2048       32       50           2       20       30
 debugfs: list_quota group
-  group id     blocks    quota    limit      inodes    quota    limit
+  group id      space    quota    limit      inodes    quota    limit
          0      16384        0        0           5        0        0
 debugfs: get_quota user 0
-   user id     blocks    quota    limit      inodes    quota    limit
+   user id      space    quota    limit      inodes    quota    limit
          0      13312        0        0           2        0        0
 debugfs: get_quota user 100
-   user id     blocks    quota    limit      inodes    quota    limit
+   user id      space    quota    limit      inodes    quota    limit
        100       2048       32       50           2       20       30
 debugfs: get_quota user 34
-   user id     blocks    quota    limit      inodes    quota    limit
+   user id      space    quota    limit      inodes    quota    limit
         34       1024        0        0           1        0        0
 debugfs: get_quota group 0
-  group id     blocks    quota    limit      inodes    quota    limit
+  group id      space    quota    limit      inodes    quota    limit
          0      16384        0        0           5        0        0
 debugfs: 
-- 
2.26.2

[PATCH 8/8] quota: Drop dead code

[Jan Kara]

Drop unused function from quota support code.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 lib/support/mkquota.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
index 0fefca90c843..a4401b7f77af 100644
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@@ -564,26 +564,6 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data)
 	return 0;
 }
 
-/*
- * Write all memory dquots into quota file
- */
-#if 0 /* currently unused, but may be useful in the future? */
-static errcode_t quota_write_all_dquots(struct quota_handle *qh,
-                                        quota_ctx_t qctx)
-{
-	errcode_t err;
-
-	err = ext2fs_read_bitmaps(qctx->fs);
-	if (err)
-		return err;
-	write_dquots(qctx->quota_dict[qh->qh_type], qh);
-	ext2fs_mark_bb_dirty(qctx->fs);
-	qctx->fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
-	ext2fs_write_bitmaps(qctx->fs);
-	return 0;
-}
-#endif
-
 /*
  * Read quotas from disk and updates the in-memory information determined by
  * 'flags' from the on-disk data.
-- 
2.26.2

Re: [PATCH 0/8 v2] Quota fixes for e2fsprogs

[Jan Kara]

Hello Ted!

Ping? What about these fixes?

								Honza

On Mon 23-08-21 17:41:20, Jan Kara wrote:
> Hello,
> 
> here is next revision of my quota fixes for e2fsprogs. When addressing the
> e2fsck regression Ted has pointed out, I've noticed another serious bug in
> e2fsck support for quotas where it just nukes existing quota limits when
> replaying orphan list. A fix is now included in this series together with
> expanded test to catch the problem.
> 
> Changes since v1:
> * Rename the functions so that names match functionality
> * Fix e2fsck regression when processing orphan list
> * Fix e2fsck bug to preserve quota limits over orphan processing
> * Expand test to verify quota limits are properly preserved
> * Fix quota output headings in debugfs
> 
> 								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Re: [PATCH 1/8] quota: Add support to version 0 quota format

[Theodore Ts'o]

On Mon, 23 Aug 2021 17:41:21 +0200, Jan Kara wrote:
> Version 0 quota format differs from version 1 by having only 32-bit
> counters for inodes and block limits. For many installations this is not
> limiting and thus the format is widely used. Also quota tools still
> create quota files with this format by default. Add support for this
> quota format to e2fsprogs so that we can seamlessly convert quota files
> in this format into our internal quota files.
> 
> [...]

Applied, thanks!

[1/8] quota: Add support to version 0 quota format
      (no commit info)
[2/8] quota: Fold quota_read_all_dquots() into quota_update_limits()
      (no commit info)
[3/8] quota: Rename quota_update_limits() to quota_read_all_dquots()
      (no commit info)
[4/8] tune2fs: Fix conversion of quota files
      (no commit info)
[5/8] e2fsck: Do not trash user limits when processing orphan list
      (no commit info)
[6/8] tests: Expand test checking quota and orphan processing interaction
      (no commit info)
[7/8] debugfs: Fix headers for quota commands
      (no commit info)
[8/8] quota: Drop dead code
      (no commit info)

Best regards,
-- 
Theodore Ts'o <tytso@mit.edu>