GitLab

This commit just moves around code to match the general organization of
the file.
Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20200515053500.215929-2-saravanak@google.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>