Commit 6afbc01d authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm mpath: eliminate pg_ready() wrapper 



pg_ready() is not comprehensive in its logic and only serves to
obfuscate code.  Replace pg_ready() with the appropriate logic in
multipath_map().

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 97e7cdf1

drivers/md/dm-mpath.c

+2 −4
Original line number Diff line number Diff line
@@ -373,8 +373,6 @@ static int __must_push_back(struct multipath *m) 
		 dm_noflush_suspending(m->ti)));

}



#define pg_ready(m) (!(m)->queue_io && !(m)->pg_init_required)



/*

 * Map cloned requests

 */
@@ -402,11 +400,11 @@ static int multipath_map(struct dm_target *ti, struct request *clone, 
		if (!__must_push_back(m))

			r = -EIO;	/* Failed */

		goto out_unlock;

	}

	if (!pg_ready(m)) {

	} else if (m->queue_io || m->pg_init_required) {

		__pg_init_all_paths(m);

		goto out_unlock;

	}



	if (set_mapinfo(m, map_context) < 0)

		/* ENOMEM, requeue */

		goto out_unlock;