| Message ID | 20180627101955.12034-1-wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2018/06/27 19:19, Qu Wenruo wrote: > Commit ff3d27a048d9 ("btrfs: qgroup: Finish rescan when hit the last leaf > of extent tree") added a new exit for rescan finish. > > However after finishing quota rescan, we set > fs_info->qgroup_rescan_progress to (u64)-1 before we exit through the > original exit path. > While we missed that assignment of (u64)-1 in the new exit path. > > The end result is, the quota status item doesn't have the same value. > (-1 vs the last bytenr + 1) > Although it doesn't affect quota accounting, it's still better to keep > the original behavior. > > Reported-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> > Fixes: ff3d27a048d9 ("btrfs: qgroup: Finish rescan when hit the last leaf of extent tree") > Signed-off-by: Qu Wenruo <wqu@suse.com> > --- > changelog: > v2: > Commit message update, as the bug only changes the resulting quota status > item without impacting the behavior. Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> (As you said, the problem I reported in https://marc.info/?t=152999303500007&r=1&w=2 is not related to this change) Thanks, Tomohiro Misono > --- > fs/btrfs/qgroup.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c > index 1874a6d2e6f5..99f2b9ce0f15 100644 > --- a/fs/btrfs/qgroup.c > +++ b/fs/btrfs/qgroup.c > @@ -2680,8 +2680,10 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path, > free_extent_buffer(scratch_leaf); > } > > - if (done && !ret) > + if (done && !ret) { > ret = 1; > + fs_info->qgroup_rescan_progress.objectid = (u64)-1; > + } > return ret; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jun 27, 2018 at 06:19:55PM +0800, Qu Wenruo wrote: > Commit ff3d27a048d9 ("btrfs: qgroup: Finish rescan when hit the last leaf > of extent tree") added a new exit for rescan finish. > > However after finishing quota rescan, we set > fs_info->qgroup_rescan_progress to (u64)-1 before we exit through the > original exit path. > While we missed that assignment of (u64)-1 in the new exit path. > > The end result is, the quota status item doesn't have the same value. > (-1 vs the last bytenr + 1) > Although it doesn't affect quota accounting, it's still better to keep > the original behavior. > > Reported-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> > Fixes: ff3d27a048d9 ("btrfs: qgroup: Finish rescan when hit the last leaf of extent tree") > Signed-off-by: Qu Wenruo <wqu@suse.com> Thanks, added to 4.18 queue. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 1874a6d2e6f5..99f2b9ce0f15 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -2680,8 +2680,10 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path, free_extent_buffer(scratch_leaf); } - if (done && !ret) + if (done && !ret) { ret = 1; + fs_info->qgroup_rescan_progress.objectid = (u64)-1; + } return ret; }
Commit ff3d27a048d9 ("btrfs: qgroup: Finish rescan when hit the last leaf of extent tree") added a new exit for rescan finish. However after finishing quota rescan, we set fs_info->qgroup_rescan_progress to (u64)-1 before we exit through the original exit path. While we missed that assignment of (u64)-1 in the new exit path. The end result is, the quota status item doesn't have the same value. (-1 vs the last bytenr + 1) Although it doesn't affect quota accounting, it's still better to keep the original behavior. Reported-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> Fixes: ff3d27a048d9 ("btrfs: qgroup: Finish rescan when hit the last leaf of extent tree") Signed-off-by: Qu Wenruo <wqu@suse.com> --- changelog: v2: Commit message update, as the bug only changes the resulting quota status item without impacting the behavior. --- fs/btrfs/qgroup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)