---

 libmpathpersist/mpath_persist.c |  230 +++++++++++------------

 libmpathpersist/mpath_persist.h |   40 ++++

 mpathpersist/main.c             |  223 ++++++++++++++++++-----

 mpathpersist/main.h             |    1 

 mpathpersist/mpathpersist.8     |  385 ++++++++++++++++++++++++++++++----------

 5 files changed, 616 insertions(+), 263 deletions(-)

Index: multipath-tools-130222/mpathpersist/main.c

===================================================================

--- multipath-tools-130222.orig/mpathpersist/main.c

+++ multipath-tools-130222/mpathpersist/main.c

@@ -18,6 +18,7 @@

 #include <pthread.h>

 #include <ctype.h>

 #include <string.h>

+#include <errno.h>

 static const char * pr_type_strs[] = {

 	"obsolete [0]",

@@ -46,9 +47,101 @@ int construct_transportid(const char * i

 int logsink;

 unsigned int mpath_mx_alloc_len;

-int main (int argc, char * argv[])

+static int verbose, loglevel, noisy;

+

+static int handle_args(int argc, char * argv[], int line);

+

+static int do_batch_file(const char *batch_fn)

 {

-	int fd, c, res;

+	char command[] = "mpathpersist";

+	const int ARGV_CHUNK = 2;

+	const char delims[] = " \t\n";

+	size_t len = 0;

+	char *line = NULL;

+	ssize_t n;

+	int nline = 0;

+	int argl = ARGV_CHUNK;

+	FILE *fl;

+	char **argv = calloc(argl, sizeof(*argv));

+	int ret = MPATH_PR_SUCCESS;

+

+	if (argv == NULL)

+		return MPATH_PR_OTHER;

+

+	fl = fopen(batch_fn, "r");

+	if (fl == NULL) {

+		fprintf(stderr, "unable to open %s: %s\n",

+			batch_fn, strerror(errno));

+		free(argv);

+		return MPATH_PR_SYNTAX_ERROR;

+	} else {

+		if (verbose >= 2)

+			fprintf(stderr, "running batch file %s\n",

+				batch_fn);

+	}

+

+	while ((n = getline(&line, &len, fl)) != -1) {

+		char *_token, *token;

+		int argc = 0;

+		int rv;

+

+		nline++;

+		argv[argc++] = command;

+

+		if (line[n-1] == '\n')

+			line[n-1] = '\0';

+		if (verbose >= 3)

+			fprintf(stderr, "processing line %d: %s\n",

+				nline, line);

+

+		for (token = strtok_r(line, delims, &_token);

+		     token != NULL && *token != '#';

+		     token = strtok_r(NULL, delims, &_token)) {

+

+			if (argc >= argl) {

+				int argn = argl + ARGV_CHUNK;

+				char **tmp;

+

+				tmp = realloc(argv, argn * sizeof(*argv));

+				if (tmp == NULL)

+					break;

+				argv = tmp;

+				argl = argn;

+			}

+

+			if (argc == 1 && !strcmp(token, command))

+				continue;

+

+			argv[argc++] = token;

+		}

+

+		if (argc <= 1)

+			continue;

+

+		if (verbose >= 2) {

+			int i;

+

+			fprintf(stderr, "## file %s line %d:", batch_fn, nline);

+			for (i = 0; i < argc; i++)

+				fprintf(stderr, " %s", argv[i]);

+			fprintf(stderr, "\n");

+		}

+

+		optind = 0;

+		rv = handle_args(argc, argv, nline);

+		if (rv != MPATH_PR_SUCCESS)

+			ret = rv;

+	}

+

+	fclose(fl);

+	free(argv);

+	free(line);

+	return ret;

+}

+

+static int handle_args(int argc, char * argv[], int nline)

+{

+	int fd, c;

 	const char *device_name = NULL;

 	int num_prin_sa = 0;

 	int num_prout_sa = 0;

@@ -69,45 +162,41 @@ int main (int argc, char * argv[])

 	int prin = 1;

 	int prin_sa = -1;

 	int prout_sa = -1;

-	int verbose = 0;

-	int loglevel = 0;

-	int noisy = 0;

 	int num_transport =0;

+	char *batch_fn = NULL;

 	void *resp = NULL;

 	struct transportid * tmp;

-	struct udev *udev = NULL;

-	if (optind == argc)

-	{

-

-		fprintf (stderr, "No parameter used\n");

-		usage ();

-		exit (1);

-	}

-

-	if (getuid () != 0)

-	{

-		fprintf (stderr, "need to be root\n");

-		exit (1);

-	}

-

-	udev = udev_new();

-	mpath_lib_init(udev);

-	memset(transportids,0,MPATH_MX_TIDS);

+ 	memset(transportids, 0, MPATH_MX_TIDS * sizeof(struct transportid));

 	while (1)

 	{

 		int option_index = 0;

-		c = getopt_long (argc, argv, "v:Cd:hHioZK:S:PAT:skrGILcRX:l:",

+		c = getopt_long (argc, argv, "v:Cd:hHioZK:S:PAT:skrGILcRX:l:f:",

 				long_options, &option_index);

 		if (c == -1)

 			break;

 		switch (c)

 		{

+			case 'f':

+				if (nline != 0) {

+					fprintf(stderr,

+						"ERROR: -f option not allowed in batch file\n");

+					ret = MPATH_PR_SYNTAX_ERROR;

+					goto out;

+				}

+				if (batch_fn != NULL) {

+					fprintf(stderr,

+						"ERROR: -f option can be used at most once\n");

+					ret = MPATH_PR_SYNTAX_ERROR;

+					goto out;

+				}

+				batch_fn = strdup(optarg);

+				break;

 			case 'v':

-				if (1 != sscanf (optarg, "%d", &loglevel))

+				if (nline == 0 && 1 != sscanf (optarg, "%d", &loglevel))

 				{

 					fprintf (stderr, "bad argument to '--verbose'\n");

 					return MPATH_PR_SYNTAX_ERROR;

@@ -241,8 +330,7 @@ int main (int argc, char * argv[])

                                 break;

 			default:

-				fprintf(stderr, "unrecognised switch " "code 0x%x ??\n", c);	

-				usage ();

+				fprintf(stderr, "unrecognised switch " "code 0x%x ??\n", c);

 				ret = MPATH_PR_SYNTAX_ERROR;

 				goto out;

 		}

@@ -260,27 +348,29 @@ int main (int argc, char * argv[])

 		{

 			for (; optind < argc; ++optind)

 				fprintf (stderr, "Unexpected extra argument: %s\n", argv[optind]);

-			usage ();

 			ret = MPATH_PR_SYNTAX_ERROR;

 			goto out;

 		}

 	}

-	/* set verbosity */

-	noisy = (loglevel >= 3) ? 1 : hex;

-	verbose	= (loglevel >= 4)? 4 : loglevel;

+	if (nline == 0) {

+		/* set verbosity */

+		noisy = (loglevel >= 3) ? 1 : hex;

+		verbose	= (loglevel >= 4)? 4 : loglevel;

+		ret = mpath_persistent_reserve_init_vecs(verbose);

+		if (ret != MPATH_PR_SUCCESS)

+			goto out;

+	}

-	if ((prout_flag + prin_flag) == 0)

+	if ((prout_flag + prin_flag) == 0 && batch_fn == NULL)

 	{

 		fprintf (stderr, "choose either '--in' or '--out' \n");

-		usage ();

 		ret = MPATH_PR_SYNTAX_ERROR;

 		goto out;

 	}

 	if ((prout_flag + prin_flag) > 1)

 	{

 		fprintf (stderr, "choose either '--in' or '--out' \n");

-		usage ();

 		ret = MPATH_PR_SYNTAX_ERROR;

 		goto out;

 	}

@@ -311,21 +401,19 @@ int main (int argc, char * argv[])

 		{

 			fprintf (stderr,

 					" No service action given for Persistent Reserve IN\n");

-			usage();

 			ret = MPATH_PR_SYNTAX_ERROR;

 		}

 		else if (num_prin_sa > 1)

 		{

 			fprintf (stderr, " Too many service actions given; choose "

 					"one only\n");

-			usage();

 			ret = MPATH_PR_SYNTAX_ERROR;

 		}

 	}

 	else

 	{

-		usage ();

-		ret = MPATH_PR_SYNTAX_ERROR;

+		if (batch_fn == NULL)

+			ret = MPATH_PR_SYNTAX_ERROR;

 		goto out;

 	}

@@ -333,7 +421,6 @@ int main (int argc, char * argv[])

 	{

 		fprintf (stderr, " --relative-target-port"

 				" only useful with --register-move\n");

-		usage ();

 		ret = MPATH_PR_SYNTAX_ERROR;

 		goto out;

 	}

@@ -355,7 +442,6 @@ int main (int argc, char * argv[])

 	if (device_name == NULL)

 	{

 		fprintf (stderr, "No device name given \n");

-		usage ();

 		ret = MPATH_PR_SYNTAX_ERROR;

 		goto out;

 	}

@@ -382,7 +468,7 @@ int main (int argc, char * argv[])

 			goto out;

 		}

-		ret = mpath_persistent_reserve_in (fd, prin_sa, resp, noisy, verbose);

+		ret = __mpath_persistent_reserve_in (fd, prin_sa, resp, noisy);

 		if (ret != MPATH_PR_SUCCESS )

 		{

 			fprintf (stderr, "Persistent Reserve IN command failed\n");

@@ -442,8 +528,8 @@ int main (int argc, char * argv[])

 		}

 		/* PROUT commands other than 'register and move' */

-		ret = mpath_persistent_reserve_out (fd, prout_sa, 0, prout_type,

-				paramp, noisy, verbose);

+		ret = __mpath_persistent_reserve_out (fd, prout_sa, 0, prout_type,

+				paramp, noisy);

 		for (j = 0 ; j < num_transport; j++)

 		{

 			tmp = paramp->trnptid_list[j];

@@ -466,17 +552,57 @@ int main (int argc, char * argv[])

 		printf("PR out: command failed\n");

 	}

-	res = close (fd);

-	if (res < 0)

+	close (fd);

+

+out :

+	if (ret == MPATH_PR_SYNTAX_ERROR) {

+		free(batch_fn);

+		if (nline == 0)

+			usage();

+		else

+			fprintf(stderr, "syntax error on line %d in batch file\n",

+				nline);

+	} else if (batch_fn != NULL) {

+		int rv = do_batch_file(batch_fn);

+

+		free(batch_fn);

+		ret = ret == 0 ? rv : ret;

+	}

+	if (nline == 0)

+		mpath_persistent_reserve_free_vecs();

+	return (ret >= 0) ? ret : MPATH_PR_OTHER;

+}

+

+int main(int argc, char *argv[])

+{

+	struct udev *udev;

+	int ret;

+

+	if (optind == argc)

+	{

+

+		fprintf (stderr, "No parameter used\n");

+		usage ();

+		exit (1);

+	}

+

+	if (getuid () != 0)

 	{

-		mpath_lib_exit();

+		fprintf (stderr, "need to be root\n");

+		exit (1);

+	}

+

+	udev = udev_new();

+	if(mpath_lib_init(udev) != 0) {

 		udev_unref(udev);

-		return MPATH_PR_FILE_ERROR;

+		exit(1);

 	}

-out :

+	ret = handle_args(argc, argv, 0);

+

 	mpath_lib_exit();

 	udev_unref(udev);

+

 	return (ret >= 0) ? ret : MPATH_PR_OTHER;

 }

@@ -677,6 +803,7 @@ static void usage()

 			"                   4           Informational messages with trace enabled\n"

 			"    --clear|-C                 PR Out: Clear\n"

 			"    --device=DEVICE|-d DEVICE  query or change DEVICE\n"

+			"    --batch-file|-f FILE       run commands from FILE\n"

 			"    --help|-h                  output this usage message\n"

 			"    --hex|-H                   output response in hex\n"

 			"    --in|-i                    request PR In command \n"

Index: multipath-tools-130222/mpathpersist/main.h

===================================================================

--- multipath-tools-130222.orig/mpathpersist/main.h

+++ multipath-tools-130222/mpathpersist/main.h

@@ -2,6 +2,7 @@ static struct option long_options[] = {

 	{"verbose", 1, 0, 'v'},

 	{"clear", 0, 0, 'C'},

 	{"device", 1, 0, 'd'},

+	{"batch-file", 1, 0, 'f' },

 	{"help", 0, 0, 'h'},

 	{"hex", 0, 0, 'H'},

 	{"in", 0, 0, 'i'},

Index: multipath-tools-130222/libmpathpersist/mpath_persist.c

===================================================================

--- multipath-tools-130222.orig/libmpathpersist/mpath_persist.c

+++ multipath-tools-130222/libmpathpersist/mpath_persist.c

@@ -16,6 +16,7 @@

 #include <config.h>

 #include <switchgroup.h>

 #include <discovery.h>

+#include <configure.h>

 #include <dmparser.h>

 #include <ctype.h>

 #include <propsel.h>

@@ -80,17 +81,21 @@ updatepaths (struct multipath * mpp)

 					pp->state = PATH_DOWN;

 					continue;

 				}

-				pp->mpp = mpp;

-				pathinfo(pp, conf->hwtable, DI_ALL);

-				continue;

 			}

 			pp->mpp = mpp;

+			if (pp->udev == NULL) {

+				pp->udev = udev_device_new_from_devnum(conf->udev, 'b', parse_devt(pp->dev_t));

+				if (pp->udev == NULL) {

+					pp->state = PATH_DOWN;

+					continue;

+				}

+				pathinfo(pp, conf->hwtable,

+					 DI_SYSFS|DI_CHECKER);

+				continue;

+			}

 			if (pp->state == PATH_UNCHECKED ||

 					pp->state == PATH_WILD)

 				pathinfo(pp, conf->hwtable, DI_CHECKER);

-

-			if (pp->priority == PRIO_UNDEF)

-				pathinfo(pp, conf->hwtable, DI_PRIO);

 		}

 	}

 	return 0;

@@ -129,45 +134,44 @@ mpath_prin_activepath (struct multipath

 int mpath_persistent_reserve_in (int fd, int rq_servact, struct prin_resp *resp, int noisy, int verbose)

 {

-	struct stat info;

-	vector curmp = NULL;

-	vector pathvec = NULL;

-	char * alias;

-	struct multipath * mpp;

-	int map_present;

-	int major, minor;

-	int ret;

+	int ret = mpath_persistent_reserve_init_vecs(verbose);

-	conf->verbosity = verbose;

+	if (ret != MPATH_PR_SUCCESS)

+		return ret;

+	ret = __mpath_persistent_reserve_in(fd, rq_servact, resp, noisy);

+	mpath_persistent_reserve_free_vecs();

+	return ret;

+}

-	if (fstat( fd, &info) != 0){

-		condlog(0, "stat error %d", fd);

-		return MPATH_PR_FILE_ERROR;

-	} 

-	if(!S_ISBLK(info.st_mode)){

-		condlog(0, "Failed to get major:minor. fd = %d", fd);

-		return MPATH_PR_FILE_ERROR;

-	}

+int mpath_persistent_reserve_out ( int fd, int rq_servact, int rq_scope,

+	unsigned int rq_type, struct prout_param_descriptor *paramp, int noisy, int verbose)

+{

+	int ret = mpath_persistent_reserve_init_vecs(verbose);

-	major = (int)MAJOR(info.st_rdev);

-	minor = (int)MINOR(info.st_rdev);	

-	condlog(4, "Device %d:%d:  ", major, minor);

+	if (ret != MPATH_PR_SUCCESS)

+		return ret;

+	ret = __mpath_persistent_reserve_out(fd, rq_servact, rq_scope, rq_type,

+					     paramp, noisy);

+	mpath_persistent_reserve_free_vecs();

+	return ret;

+}

-	/* get alias from major:minor*/

-	alias = dm_mapname(major, minor);

-	if (!alias){

-		condlog(0, "%d:%d failed to get device alias.", major, minor);

-		return MPATH_PR_DMMP_ERROR;

-	}

+static vector curmp;

+static vector pathvec;

-	condlog(3, "alias = %s", alias);

-	map_present = dm_map_present(alias);

-	if (map_present && !dm_is_mpath(alias)){

-		condlog( 0, "%s: not a multipath device.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out;

-	}

+void mpath_persistent_reserve_free_vecs(void)

+{

+	free_multipathvec(curmp, KEEP_PATHS);

+	free_pathvec(pathvec, FREE_PATHS);

+	curmp = pathvec = NULL;

+}

+

+int mpath_persistent_reserve_init_vecs(int verbose)

+{

+	conf->verbosity = verbose;

+	if (curmp)

+		return MPATH_PR_SUCCESS;

 	/*

 	 * allocate core vectors to store paths and multipaths

 	 */

@@ -175,63 +179,32 @@ int mpath_persistent_reserve_in (int fd,

 	pathvec = vector_alloc ();

 	if (!curmp || !pathvec){

-		condlog (0, "%s: vector allocation failed.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out;

-	}

-

-	if (path_discovery(pathvec, conf, DI_SYSFS | DI_CHECKER) < 0) {

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out1;

-	}

-

-	/* get info of all paths from the dm device	*/

-	if (get_mpvec (curmp, pathvec, alias)){

-		condlog(0, "%s: failed to get device info.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out1;

+		condlog (0, "vector allocation failed.");

+		goto err;

 	}

-	mpp = find_mp_by_alias(curmp, alias);

-	if (!mpp){

-		condlog(0, "%s: devmap not registered.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out1;

-	}

+	if (dm_get_maps(curmp))

+		goto err;

-	ret = mpath_prin_activepath(mpp, rq_servact, resp, noisy);

+	return MPATH_PR_SUCCESS;

-out1:

-	free_multipathvec(curmp, KEEP_PATHS);

-	free_pathvec(pathvec, FREE_PATHS);	

-out:

-	FREE(alias);

-	return ret; 						

+err:

+	mpath_persistent_reserve_free_vecs();

+	return MPATH_PR_DMMP_ERROR;

 }

-int mpath_persistent_reserve_out ( int fd, int rq_servact, int rq_scope,

-		unsigned int rq_type, struct prout_param_descriptor *paramp, int noisy, int verbose)

+static int mpath_get_map(int fd, char **palias, struct multipath **pmpp)

 {

-

+	int ret = MPATH_PR_DMMP_ERROR;

 	struct stat info;

-

-	vector curmp = NULL;

-	vector pathvec = NULL;

-

-	char * alias;

-	struct multipath * mpp;

-	int map_present;

 	int major, minor;

-	int ret;

-	uint64_t prkey;

-

-	conf->verbosity = verbose;

+	char *alias;

+	struct multipath *mpp;

-	if (fstat( fd, &info) != 0){

+	if (fstat(fd, &info) != 0){

 		condlog(0, "stat error fd=%d", fd);

 		return MPATH_PR_FILE_ERROR;

 	}

-

 	if(!S_ISBLK(info.st_mode)){

 		condlog(3, "Failed to get major:minor. fd=%d", fd);

 		return MPATH_PR_FILE_ERROR;	

@@ -241,53 +214,72 @@ int mpath_persistent_reserve_out ( int f

 	minor = (int)MINOR(info.st_rdev);

 	condlog(4, "Device  %d:%d", major, minor);

-	/* get WWN of the device from major:minor*/

+	/* get alias from major:minor*/

 	alias = dm_mapname(major, minor);

 	if (!alias){

+		condlog(0, "%d:%d failed to get device alias.", major, minor);

 		return MPATH_PR_DMMP_ERROR;

 	}

 	condlog(3, "alias = %s", alias);

-	map_present = dm_map_present(alias);

-	if (map_present && !dm_is_mpath(alias)){

+	if (dm_map_present(alias) && !dm_is_mpath(alias)){

 		condlog(3, "%s: not a multipath device.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out;

-	}

-

-	/*

-	 * allocate core vectors to store paths and multipaths

-	 */

-	curmp = vector_alloc ();

-	pathvec = vector_alloc ();

-

-	if (!curmp || !pathvec){

-		condlog (0, "%s: vector allocation failed.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

 		goto out;

 	}

-	if (path_discovery(pathvec, conf, DI_SYSFS | DI_CHECKER) < 0) {

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out1;

-	}

-

 	/* get info of all paths from the dm device     */

 	if (get_mpvec(curmp, pathvec, alias)){

 		condlog(0, "%s: failed to get device info.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out1;

+		goto out;

 	}

 	mpp = find_mp_by_alias(curmp, alias);

 	if (!mpp) {

 		condlog(0, "%s: devmap not registered.", alias);

-		ret = MPATH_PR_DMMP_ERROR;

-		goto out1;

+		goto out;

 	}

+	ret = MPATH_PR_SUCCESS;

+	if (pmpp)

+		*pmpp = mpp;

+	if (palias) {

+		*palias = alias;

+		alias = NULL;

+	}

+out:

+	FREE(alias);

+	return ret;

+}

+

+int __mpath_persistent_reserve_in (int fd, int rq_servact,

+	struct prin_resp *resp, int noisy)

+{

+	struct multipath *mpp;

+	int ret;

+

+	ret = mpath_get_map(fd, NULL, &mpp;;

+	if (ret != MPATH_PR_SUCCESS)

+		return ret;

+

+	ret = mpath_prin_activepath(mpp, rq_servact, resp, noisy);

+

+	return ret;

+}

+

+int __mpath_persistent_reserve_out ( int fd, int rq_servact, int rq_scope,

+	unsigned int rq_type, struct prout_param_descriptor *paramp, int noisy)

+{

+	struct multipath *mpp;

+	char *alias;

+	int ret;

+	uint64_t prkey;

+

+	ret = mpath_get_map(fd, &alias, &mpp;;

+	if (ret != MPATH_PR_SUCCESS)

+		return ret;

+

 	select_reservation_key(mpp);

 	select_all_tg_pt(mpp);

@@ -350,10 +342,6 @@ int mpath_persistent_reserve_out ( int f

 		}

 	}

 out1:

-	free_multipathvec(curmp, KEEP_PATHS);

-	free_pathvec(pathvec, FREE_PATHS);

-

-out:

 	FREE(alias);

 	return ret; 

 }

@@ -365,21 +353,22 @@ get_mpvec (vector curmp, vector pathvec,

 	struct multipath *mpp;

 	char params[PARAMS_SIZE], status[PARAMS_SIZE];

-	if (dm_get_maps (curmp)){

-		return 1;

-	}

-

 	vector_foreach_slot (curmp, mpp, i){

 		/*

 		 * discard out of scope maps

 		 */

-		if (mpp->alias && refwwid && strncmp (mpp->alias, refwwid, WWID_SIZE)){

-			free_multipath (mpp, KEEP_PATHS);

-			vector_del_slot (curmp, i);

-			i--;

+		if (!mpp->alias) {

+			condlog(0, "%s: map with empty alias!", __func__);

 			continue;

 		}

+		if (mpp->pg != NULL)

+			/* Already seen this one */

+			continue;

+

+		if (refwwid && strncmp (mpp->alias, refwwid, WWID_SIZE - 1))

+			continue;

+

 		dm_get_map(mpp->alias, &mpp->size, params);

 		condlog(3, "params = %s", params);

 		dm_get_status(mpp->alias, status);

@@ -392,7 +381,6 @@ get_mpvec (vector curmp, vector pathvec,

 		 * about them

 		 */

 		updatepaths(mpp);

-		mpp->bestpg = select_path_group (mpp);

 		disassemble_status (status, mpp);