On Tue, Apr 16, 2024 at 06:16:50PM +0800, Chao Yu wrote:
> Previously, in f2fs, sysfile quota feature has different name:
> - "quota" in mkfs.f2fs
> - and "quota_ino" in dump.f2fs
>
> Now, it has unified the name to "quota" since commit 92cc5edeb7
> ("f2fs-tools: reuse feature_table to clean up print_sb_state()").
>
> It needs to update keywords "quota" in _require_prjquota() for f2fs,
> Otherwise, quota testcase will fail as below.
>
> generic/383 1s ... [not run] quota sysfile not enabled in this device /dev/vdc
>
> This patch keeps keywords "quota_ino" in _require_prjquota() to
> keep compatibility for old f2fs-tools.
>
> Cc: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
> Signed-off-by: Chao Yu <chao@xxxxxxxxxx>
> ---
> v2:
> - keep keywords "quota_ino" for compatibility of old f2fs-tools
> suggested by Zorro Lang.
This version looks good to me, thanks
Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx>
> common/quota | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/quota b/common/quota
> index 6b529bf4..4c1d3dcd 100644
> --- a/common/quota
> +++ b/common/quota
> @@ -145,7 +145,7 @@ _require_prjquota()
> if [ "$FSTYP" == "f2fs" ]; then
> dump.f2fs $_dev 2>&1 | grep -qw project_quota
> [ $? -ne 0 ] && _notrun "Project quota not enabled in this device $_dev"
> - dump.f2fs $_dev 2>&1 | grep -qw quota_ino
> + dump.f2fs $_dev 2>&1 | grep -Eqw "quota|quota_ino"
> [ $? -ne 0 ] && _notrun "quota sysfile not enabled in this device $_dev"
> cat /sys/fs/f2fs/features/project_quota | grep -qw supported
> [ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
> --
> 2.40.1
>
