Automatic merge from submit-queue (batch tested with PRs 61644, 61624, 61743, 61019, 61287). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Use inline func to ensure unlock is executed **What this PR does / why we need it**: Per discussion: https://github.com/kubernetes/kubernetes/pull/61621#issuecomment-375922184 **Special notes for your reviewer**: Ref: #58222 **Release note**: ```release-note Use inline func to ensure unlock is executed ```