Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store

Fix potential races in the volume store