From a21925594cd18569f6618c02ea7b28c4afab477b Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Thu, 13 Apr 2017 02:41:20 -0400 Subject: [PATCH] LU-4017 tune2fs: fix BUGs of tuning project quota There are several problems for project quota enable/disable: tune2fs -O ^project did not work, because @clear_ok_features did not include @EXT4_FEATURE_RO_COMPAT_PROJECT. update_feature_set() works for -O option, but tune2fs -Q prj/^prj did not work well, because function handle_quota_options() did not set and clear @EXT4_FEATURE_RO_COMPAT_PROJECT feature very well. Change-Id: I85a3d504c3619b219af8a711f8f9a3d22b9715db Signed-off-by: Wang Shilong Reviewed-on: https://review.whamcloud.com/26581 Tested-by: Jenkins Reviewed-by: Niu Yawei Tested-by: Maloo Reviewed-by: Andreas Dilger --- misc/tune2fs.c | 44 +++++++++++++++++++++++++++++++++----------- tests/t_project_1on/name | 1 + tests/t_project_1on/script | 41 +++++++++++++++++++++++++++++++++++++++++ tests/t_project_2off/name | 1 + tests/t_project_2off/script | 35 +++++++++++++++++++++++++++++++++++ tests/t_project_3on/name | 1 + tests/t_project_3on/script | 41 +++++++++++++++++++++++++++++++++++++++++ tests/t_project_4off/name | 1 + tests/t_project_4off/script | 35 +++++++++++++++++++++++++++++++++++ 9 files changed, 189 insertions(+), 11 deletions(-) create mode 100644 tests/t_project_1on/name create mode 100644 tests/t_project_1on/script create mode 100644 tests/t_project_2off/name create mode 100644 tests/t_project_2off/script create mode 100644 tests/t_project_3on/name create mode 100644 tests/t_project_3on/script create mode 100644 tests/t_project_4off/name create mode 100644 tests/t_project_4off/script diff --git a/misc/tune2fs.c b/misc/tune2fs.c index f44a2ae..caa2f1d 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -176,6 +176,7 @@ static __u32 clear_ok_features[3] = { EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| #ifdef CONFIG_QUOTA EXT4_FEATURE_RO_COMPAT_QUOTA | + EXT4_FEATURE_RO_COMPAT_PROJECT | #endif EXT4_FEATURE_RO_COMPAT_GDT_CSUM }; @@ -664,15 +665,17 @@ mmp_error: if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_PROJECT)) { - if (!Q_flag && !(sb->s_feature_ro_compat & - EXT4_FEATURE_RO_COMPAT_QUOTA)) - fputs(_("\nWarning: enabled project without quota together\n"), - stderr); Q_flag = 1; quota_enable[PRJQUOTA] = QOPT_ENABLE; } if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT, + EXT4_FEATURE_RO_COMPAT_PROJECT)) { + Q_flag = 1; + quota_enable[PRJQUOTA] = QOPT_DISABLE; + } + + if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_QUOTA)) { /* * Set the Q_flag here and handle the quota options in the code @@ -802,6 +805,7 @@ static void handle_quota_options(ext2_filsys fs) ext2_ino_t qf_ino; enum quota_type qtype; int enable = 0; + int need_dirty = 0; for (qtype = 0 ; qtype < MAXQUOTAS; qtype++) if (quota_enable[qtype] != 0) @@ -827,26 +831,44 @@ static void handle_quota_options(ext2_filsys fs) QFMT_VFS_V1)) > 0) quota_update_limits(qctx, qf_ino, qtype); quota_write_inode(qctx, 1 << qtype); + /* Enable Quota feature if one of quota enabled */ + if (!(fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_QUOTA)) { + fs->super->s_feature_ro_compat |= + EXT4_FEATURE_RO_COMPAT_QUOTA; + need_dirty = 1; + } + if (qtype == PRJQUOTA && + !(fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_PROJECT)) { + fs->super->s_feature_ro_compat |= + EXT4_FEATURE_RO_COMPAT_PROJECT; + need_dirty = 1; + } } else if (quota_enable[qtype] == QOPT_DISABLE) { quota_remove_inode(fs, qtype); + if (qtype == PRJQUOTA) { + fs->super->s_feature_ro_compat &= + ~EXT4_FEATURE_RO_COMPAT_PROJECT; + need_dirty = 1; + } } } quota_release_context(&qctx); - - if (enable) { - fs->super->s_feature_ro_compat |= EXT4_FEATURE_RO_COMPAT_QUOTA; - ext2fs_mark_super_dirty(fs); - } else { + /* Clear Quota feature if all quota types disabled. */ + if (!enable) { for (qtype = 0 ; qtype < MAXQUOTAS; qtype++) - if (*quota_sb_inump(fs->super, qtype) != 0) + if (*quota_sb_inump(fs->super, qtype)) break; if (qtype == MAXQUOTAS) { fs->super->s_feature_ro_compat &= ~EXT4_FEATURE_RO_COMPAT_QUOTA; - ext2fs_mark_super_dirty(fs); + need_dirty = 1; } } + if (need_dirty) + ext2fs_mark_super_dirty(fs); return; } diff --git a/tests/t_project_1on/name b/tests/t_project_1on/name new file mode 100644 index 0000000..6b2dd29 --- /dev/null +++ b/tests/t_project_1on/name @@ -0,0 +1 @@ +enable project using tune2fs -O option diff --git a/tests/t_project_1on/script b/tests/t_project_1on/script new file mode 100644 index 0000000..52466a7 --- /dev/null +++ b/tests/t_project_1on/script @@ -0,0 +1,41 @@ +FSCK_OPT=-yf + +if [ "$QUOTA" != "y" ]; then + echo "$test_name: $test_description: skipped" + return 0 +fi + +$MKE2FS -q -F -o Linux -I 256 -b 4096 $TMPFILE 10000 > $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "mke2fs failed" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +dd if=/dev/zero of=$TMPFILE.2 bs=1048576 count=1 >> $test_name.log 2>&1 +cat <<- EOF | $DEBUGFS -w -f /dev/stdin $TMPFILE >> $test_name.log 2>&1 + write $TMPFILE.2 file1 + set_inode_field file1 projid 500 +EOF +rm -f $TMPFILE.2 + +$TUNE2FS -O project $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "tune2fs -O project failed with $status" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" = 0 ] ; then + echo "$test_name: $test_description: ok" + touch $test_name.ok +else + echo "e2fsck with project enabled failed with $status" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi +rm -f $TMPFILE diff --git a/tests/t_project_2off/name b/tests/t_project_2off/name new file mode 100644 index 0000000..293717d --- /dev/null +++ b/tests/t_project_2off/name @@ -0,0 +1 @@ +disable project using tune2fs diff --git a/tests/t_project_2off/script b/tests/t_project_2off/script new file mode 100644 index 0000000..98696b4 --- /dev/null +++ b/tests/t_project_2off/script @@ -0,0 +1,35 @@ +FSCK_OPT=-yf + +if [ "$QUOTA" != "y" ]; then + echo "$test_name: $test_description: skipped" + return 0 +fi + +$MKE2FS -q -F -o Linux -I 256 -b 4096 -O quota,project $TMPFILE 100 > $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "mke2fs -O quota,project failed" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +$TUNE2FS -O ^project $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "tune2fs -O ^project failed" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" = 0 ] ; then + echo "$test_name: $test_description: ok" + touch $test_name.ok +else + echo "e2fsck with project enabled failed with $status" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +rm -f $TMPFILE diff --git a/tests/t_project_3on/name b/tests/t_project_3on/name new file mode 100644 index 0000000..9a10680 --- /dev/null +++ b/tests/t_project_3on/name @@ -0,0 +1 @@ +enable project using tune2fs -Q option diff --git a/tests/t_project_3on/script b/tests/t_project_3on/script new file mode 100644 index 0000000..1143ba4 --- /dev/null +++ b/tests/t_project_3on/script @@ -0,0 +1,41 @@ +FSCK_OPT=-yf + +if [ "$QUOTA" != "y" ]; then + echo "$test_name: $test_description: skipped" + return 0 +fi + +$MKE2FS -q -F -o Linux -I 256 -b 4096 $TMPFILE 10000 > $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "mke2fs failed" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +dd if=/dev/zero of=$TMPFILE.2 bs=1048576 count=1 >> $test_name.log 2>&1 +cat <<- EOF | $DEBUGFS -w -f /dev/stdin $TMPFILE >> $test_name.log 2>&1 + write $TMPFILE.2 file1 + set_inode_field file1 projid 500 +EOF +rm -f $TMPFILE.2 + +$TUNE2FS -Q prj $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "tune2fs -Q project failed with $status" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" = 0 ] ; then + echo "$test_name: $test_description: ok" + touch $test_name.ok +else + echo "e2fsck with project enabled failed with $status" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi +rm -f $TMPFILE diff --git a/tests/t_project_4off/name b/tests/t_project_4off/name new file mode 100644 index 0000000..5ef6430 --- /dev/null +++ b/tests/t_project_4off/name @@ -0,0 +1 @@ +disable project using tune2fs -Q option diff --git a/tests/t_project_4off/script b/tests/t_project_4off/script new file mode 100644 index 0000000..29de6bc --- /dev/null +++ b/tests/t_project_4off/script @@ -0,0 +1,35 @@ +FSCK_OPT=-yf + +if [ "$QUOTA" != "y" ]; then + echo "$test_name: $test_description: skipped" + return 0 +fi + +$MKE2FS -q -F -o Linux -I 256 -b 4096 -O quota,project $TMPFILE 100 > $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "mke2fs -O quota,project failed" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +$TUNE2FS -Q ^prj $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" != 0 ] ; then + echo "tune2fs -O ^project failed" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1 +status=$? +if [ "$status" = 0 ] ; then + echo "$test_name: $test_description: ok" + touch $test_name.ok +else + echo "e2fsck with project enabled failed with $status" > $test_name.failed + echo "$test_name: $test_description: failed" + return $status +fi + +rm -f $TMPFILE -- 1.8.3.1