This also consolidates the waiting logic into a single function,
instead of having it spread across two like it is now.
Signed-off-by: NJeff Layton <jlayton@redhat.com>
Signed-off-by: NAnna Schumaker <Anna.Schumaker@Netapp.com>