[PATCH] Move empty_disk to a top-level function, and rename.