xfsprogs: xfs_quota command error message improvement
PATCH v4 1/1 xfsprogs: xfs_quota command error message improvement
Make the error messages for rudimentary xfs_quota commands (off, enable, disable) more user friendly, instead of the terse sys error outputs.
Signed-off-by Bill O'Donnell <[email protected]>
---
v4: include ENOSYS for disable, enable, and OFF cases
v3: remove EINVAL from the OFF case
v2: enable internationalization and capitalize new message strings
quota/state.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)
quota/state.c +26 -6
@@ -306,8 +306,16 @@ enable_enforcement(return ; } dir = mount->fs_name; -if (xfsquotactl (XFS_QUOTAON , dir, type,0 , (void *)&qflags) <0 ) -perror ("XFS_QUOTAON" ); +if (xfsquotactl (XFS_QUOTAON , dir, type,0 , (void *)&qflags) <0 ) { +if (errno ==EEXIST ) +fprintf (stderr, +_ ("Quota enforcement already enabled.\n" )); +else if (errno ==EINVAL || errno ==ENOSYS ) +fprintf (stderr, +_ ("Can't enable enforcement when quota off.\n" )); +else +perror ("XFS_QUOTAON" ); + }else if (flags &VERBOSE_FLAG )state_quotafile_mount (stdout, type, mount, flags); }
@@ -328,8 +336,16 @@ disable_enforcement(return ; } dir = mount->fs_name; -if (xfsquotactl (XFS_QUOTAOFF , dir, type,0 , (void *)&qflags) <0 ) -perror ("XFS_QUOTAOFF" ); +if (xfsquotactl (XFS_QUOTAOFF , dir, type,0 , (void *)&qflags) <0 ) { +if (errno ==EEXIST ) +fprintf (stderr, +_ ("Quota enforcement already disabled.\n" )); +else if (errno ==EINVAL || errno ==ENOSYS ) +fprintf (stderr, +_ ("Can't disable enforcement when quota off.\n" )); +else +perror ("XFS_QUOTAOFF" ); + }else if (flags &VERBOSE_FLAG )state_quotafile_mount (stdout, type, mount, flags); }
@@ -350,8 +366,12 @@ quotaoff(return ; } dir = mount->fs_name; -if (xfsquotactl (XFS_QUOTAOFF , dir, type,0 , (void *)&qflags) <0 ) -perror ("XFS_QUOTAOFF" ); +if (xfsquotactl (XFS_QUOTAOFF , dir, type,0 , (void *)&qflags) <0 ) { +if (errno ==EEXIST || errno ==ENOSYS ) +fprintf (stderr,_ ("Quota already off.\n" )); +else +perror ("XFS_QUOTAOFF" ); + }else if (flags &VERBOSE_FLAG )state_quotafile_mount (stdout, type, mount, flags); }
Signature · 1 line
2.26.2
Quoted 5 lines · Bill O'Donnell
Make the error messages for rudimentary
xfs_quotacommands (off, enable, disable) more user friendly, instead of the terse sys error outputs.Signed-off-by Bill O'Donnell <[email protected]>
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>