From: David Sterba Date: Wed, 22 May 2024 16:26:18 +0000 (+0200) Subject: btrfs: qgroup: warn about inconsistent qgroups when relation update fails X-Git-Tag: microblaze-v6.13~452^2~51 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a5b3abb18c380177d3a994d30a2ab890f27b8df8;p=linux-2.6-microblaze.git btrfs: qgroup: warn about inconsistent qgroups when relation update fails Calling btrfs_handle_fs_error() after btrfs_run_qgroups() fails to update the qgroup status is probably not necessary, this would turn the filesystem to read-only. For the same reason aborting the transaction is also not a good option. The state is left inconsistent and can be fixed by rescan, printing a warning should be sufficient. Return code reflects the status of adding/deleting the relation and if the transaction was ended properly. Reviewed-by: Qu Wenruo Signed-off-by: David Sterba --- diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index dc7300f2815f..1c31df88f19a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3880,8 +3880,9 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) err = btrfs_run_qgroups(trans); mutex_unlock(&fs_info->qgroup_ioctl_lock); if (err < 0) - btrfs_handle_fs_error(fs_info, err, - "failed to update qgroup status and info"); + btrfs_warn(fs_info, + "qgroup status update failed after %s relation, marked as inconsistent", + sa->assign ? "adding" : "deleting"); err = btrfs_end_transaction(trans); if (err && !ret) ret = err;