tune2fs: preserve old limits when turn on quota feature
PATCH 2/3 tune2fs: preserve old limits when turn on quota feature
When turn on quota by tune2fs, if the old quota file exist, the quota usage should be recomputed but the old limits should be preserved.
Signed-off-by Niu Yawei <[email protected]>
--- misc/tune2fs.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-)
misc/tune2fs.c +24 -7
@@ -700,7 +700,6 @@ err:void handle_quota_options (ext2_filsys fs) {quota_ctx_t qctx; -errcode_t retval;ext2_ino_t qf_ino;if (!usrquota && !grpquota)
@@ -712,15 +711,33 @@ void handle_quota_options(ext2_filsys fs)if (usrquota ==QOPT_ENABLE || grpquota ==QOPT_ENABLE )quota_compute_usage (qctx); -if (usrquota ==QOPT_ENABLE ) -quota_write_inode (qctx,USRQUOTA ); -else if (usrquota ==QOPT_DISABLE ) +if (usrquota ==QOPT_ENABLE && !fs->super->s_usr_quota_inum) { +if ((qf_ino =quota_file_exists (fs,USRQUOTA , +QFMT_VFS_V1 )) >0 ) { +if (quota_update_inode (qctx, qf_ino,USRQUOTA ) ==0 ) +quota_set_sb_inum (fs, qf_ino,USRQUOTA ); +else +quota_write_inode (qctx,USRQUOTA ); + }else { +quota_write_inode (qctx,USRQUOTA ); + } + }else if (usrquota ==QOPT_DISABLE ) {quota_remove_inode (fs,USRQUOTA ); + } -if (grpquota ==QOPT_ENABLE ) -quota_write_inode (qctx,GRPQUOTA ); -else if (grpquota ==QOPT_DISABLE ) +if (grpquota ==QOPT_ENABLE && !fs->super->s_grp_quota_inum) { +if ((qf_ino =quota_file_exists (fs,GRPQUOTA , +QFMT_VFS_V1 )) >0 ) { +if (quota_update_inode (qctx, qf_ino,GRPQUOTA ) ==0 ) +quota_set_sb_inum (fs, qf_ino,GRPQUOTA ); +else +quota_write_inode (qctx,GRPQUOTA ); + }else { +quota_write_inode (qctx,GRPQUOTA ); + } + }else if (grpquota ==QOPT_DISABLE ) {quota_remove_inode (fs,GRPQUOTA ); + }quota_release_context (&qctx);
-- 1.7.1
Ted Ts'o
AppliedQuoted 4 lines · Niu
When turn on quota by tune2fs, if the old quota file exist, the quota usage should be recomputed but the old limits should be preserved.
Signed-off-by Niu Yawei <[email protected]>
Thanks, applied.
Note: it looks like we need a similar fix for e2fsck, so that the limits are preserved, right? From what I can tell a patch to fix this hasn't crossed my desk yet....
- Ted