[PATCH] btrfs: qgroup: update rescan message levels and error codes

[PATCH] btrfs: qgroup: update rescan message levels and error codes

[David Sterba]

On filesystems without enabled quotas there's still a warning message in
the logs when rescan is called. In that case it's not a problem that
should be reported, rescan can be called unconditionally and leads.
Change the error code to ENOTCONN which is used for 'quotas not enabled'
elsewhere.

Remove message (also a warning) when rescan is called during an ongoing
rescan, this brings no useful information and the error code is
sufficient.

Change message levels to debug for now, they can be removed eventually.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 fs/btrfs/qgroup.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 1768fc6f232f..4714644daa78 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -3820,14 +3820,14 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,
 		/* we're resuming qgroup rescan at mount time */
 		if (!(fs_info->qgroup_flags &
 		      BTRFS_QGROUP_STATUS_FLAG_RESCAN)) {
-			btrfs_warn(fs_info,
+			btrfs_debug(fs_info,
 			"qgroup rescan init failed, qgroup rescan is not queued");
 			ret = -EINVAL;
 		} else if (!(fs_info->qgroup_flags &
 			     BTRFS_QGROUP_STATUS_FLAG_ON)) {
-			btrfs_warn(fs_info,
+			btrfs_debug(fs_info,
 			"qgroup rescan init failed, qgroup is not enabled");
-			ret = -EINVAL;
+			ret = -ENOTCONN;
 		}
 
 		if (ret)
@@ -3838,14 +3838,12 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,
 
 	if (init_flags) {
 		if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) {
-			btrfs_warn(fs_info,
-				   "qgroup rescan is already in progress");
 			ret = -EINPROGRESS;
 		} else if (!(fs_info->qgroup_flags &
 			     BTRFS_QGROUP_STATUS_FLAG_ON)) {
-			btrfs_warn(fs_info,
+			btrfs_debug(fs_info,
 			"qgroup rescan init failed, qgroup is not enabled");
-			ret = -EINVAL;
+			ret = -ENOTCONN;
 		} else if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED) {
 			/* Quota disable is in progress */
 			ret = -EBUSY;
-- 
2.44.0

Re: [PATCH] btrfs: qgroup: update rescan message levels and error codes

[Boris Burkov]

On Thu, May 02, 2024 at 10:45:58PM +0200, David Sterba wrote:
> On filesystems without enabled quotas there's still a warning message in
> the logs when rescan is called. In that case it's not a problem that
> should be reported, rescan can be called unconditionally and leads.
> Change the error code to ENOTCONN which is used for 'quotas not enabled'
> elsewhere.
> 
> Remove message (also a warning) when rescan is called during an ongoing
> rescan, this brings no useful information and the error code is
> sufficient.
> 
> Change message levels to debug for now, they can be removed eventually.
> 
> Signed-off-by: David Sterba <dsterba@suse.com>

Reviewed-by: Boris Burkov <boris@bur.io>

> ---
>  fs/btrfs/qgroup.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> index 1768fc6f232f..4714644daa78 100644
> --- a/fs/btrfs/qgroup.c
> +++ b/fs/btrfs/qgroup.c
> @@ -3820,14 +3820,14 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,
>  		/* we're resuming qgroup rescan at mount time */
>  		if (!(fs_info->qgroup_flags &
>  		      BTRFS_QGROUP_STATUS_FLAG_RESCAN)) {
> -			btrfs_warn(fs_info,
> +			btrfs_debug(fs_info,
>  			"qgroup rescan init failed, qgroup rescan is not queued");
>  			ret = -EINVAL;
>  		} else if (!(fs_info->qgroup_flags &
>  			     BTRFS_QGROUP_STATUS_FLAG_ON)) {
> -			btrfs_warn(fs_info,
> +			btrfs_debug(fs_info,
>  			"qgroup rescan init failed, qgroup is not enabled");
> -			ret = -EINVAL;
> +			ret = -ENOTCONN;
>  		}
>  
>  		if (ret)
> @@ -3838,14 +3838,12 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,
>  
>  	if (init_flags) {
>  		if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) {
> -			btrfs_warn(fs_info,
> -				   "qgroup rescan is already in progress");
>  			ret = -EINPROGRESS;
>  		} else if (!(fs_info->qgroup_flags &
>  			     BTRFS_QGROUP_STATUS_FLAG_ON)) {
> -			btrfs_warn(fs_info,
> +			btrfs_debug(fs_info,
>  			"qgroup rescan init failed, qgroup is not enabled");
> -			ret = -EINVAL;
> +			ret = -ENOTCONN;
>  		} else if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED) {
>  			/* Quota disable is in progress */
>  			ret = -EBUSY;
> -- 
> 2.44.0
>