From: Gao Xiang Date: Wed, 29 Jul 2020 18:02:35 +0000 (+0800) Subject: erofs: fold in used-once helper erofs_workgroup_unfreeze_final() X-Git-Tag: v5.9-rc1~112^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee4bf86c69d1e86ee0505f4824b95a74704d433f;p=thirdparty%2Fkernel%2Flinux.git erofs: fold in used-once helper erofs_workgroup_unfreeze_final() It's expected that erofs_workgroup_unfreeze_final() won't be used in other places. Let's fold it to simplify the code. Link: https://lore.kernel.org/r/20200729180235.25443-1-hsiangkao@redhat.com Reviewed-by: Chao Yu Signed-off-by: Gao Xiang --- diff --git a/fs/erofs/utils.c b/fs/erofs/utils.c index ecb85b3d4013e..de9986d2f82fd 100644 --- a/fs/erofs/utils.c +++ b/fs/erofs/utils.c @@ -127,12 +127,6 @@ int erofs_workgroup_put(struct erofs_workgroup *grp) return count; } -static void erofs_workgroup_unfreeze_final(struct erofs_workgroup *grp) -{ - erofs_workgroup_unfreeze(grp, 0); - __erofs_workgroup_free(grp); -} - static bool erofs_try_to_release_workgroup(struct erofs_sb_info *sbi, struct erofs_workgroup *grp) { @@ -162,11 +156,9 @@ static bool erofs_try_to_release_workgroup(struct erofs_sb_info *sbi, */ DBG_BUGON(xa_erase(&sbi->managed_pslots, grp->index) != grp); - /* - * If managed cache is on, last refcount should indicate - * the related workstation. - */ - erofs_workgroup_unfreeze_final(grp); + /* last refcount should be connected with its managed pslot. */ + erofs_workgroup_unfreeze(grp, 0); + __erofs_workgroup_free(grp); return true; }