| From 954098ed37f677580d4b609fb6320abd38f59de1 Mon Sep 17 00:00:00 2001 |
| From: Nikolay Borisov <nborisov@suse.com> |
| Date: Mon, 18 Nov 2019 14:16:44 +0200 |
| Subject: [PATCH] btrfs: Fix error messages in qgroup_rescan_init |
| |
| commit 37d02592f11bb76e4ab1dcaa5b8a2a0715403207 upstream. |
| |
| The branch of qgroup_rescan_init which is executed from the mount |
| path prints wrong errors messages. The textual print out in case |
| BTRFS_QGROUP_STATUS_FLAG_RESCAN/BTRFS_QGROUP_STATUS_FLAG_ON are not |
| set are transposed. Fix it by exchanging their place. |
| |
| Signed-off-by: Nikolay Borisov <nborisov@suse.com> |
| Reviewed-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c |
| index e2d33a819f69..ef29002e2cf2 100644 |
| --- a/fs/btrfs/qgroup.c |
| +++ b/fs/btrfs/qgroup.c |
| @@ -3220,12 +3220,12 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, |
| if (!(fs_info->qgroup_flags & |
| BTRFS_QGROUP_STATUS_FLAG_RESCAN)) { |
| btrfs_warn(fs_info, |
| - "qgroup rescan init failed, qgroup is not enabled"); |
| + "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, |
| - "qgroup rescan init failed, qgroup rescan is not queued"); |
| + "qgroup rescan init failed, qgroup is not enabled"); |
| ret = -EINVAL; |
| } |
| |
| -- |
| 2.7.4 |
| |
