This will make the dynamic-id stuff easier to do, as it will be
self-contained.

No logic was changed at all.
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>