rpms/autofs/devel autofs-5.0.1-random-selection.patch,1.1,1.2

Fri Mar 16 07:31:45 UTC 2007

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13917

Modified Files:
	autofs-5.0.1-random-selection.patch 
Log Message:
- fix random selection patch.


autofs-5.0.1-random-selection.patch:
 daemon/automount.c   |   12 +++++++++++-
 include/replicated.h |    1 +
 man/automount.8.in   |    4 ++++
 modules/mount_nfs.c  |    2 ++
 modules/replicated.c |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 63 insertions(+), 6 deletions(-)

Index: autofs-5.0.1-random-selection.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs-5.0.1-random-selection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- autofs-5.0.1-random-selection.patch	16 Mar 2007 07:26:19 -0000	1.1
+++ autofs-5.0.1-random-selection.patch	16 Mar 2007 07:31:43 -0000	1.2
@@ -1,61 +1,5 @@
-diff --git a/daemon/automount.c b/daemon/automount.c
-index 5989324..938ee1b 100644
---- a/daemon/automount.c
-+++ b/daemon/automount.c
-@@ -48,6 +48,8 @@ const char *mapdir = AUTOFS_MAP_DIR;	/* Location of mount maps */
- const char *confdir = AUTOFS_CONF_DIR;	/* Location of autofs config file */
- 
- static char *pid_file = NULL;	/* File in which to keep pid */
-+unsigned int random_selection;	/* use random policy when selecting
-+				 * which multi-mount host to mount */
- static int start_pipefd[2];
- static int st_stat = 0;
- static int *pst_stat = &st_stat;
-@@ -1363,6 +1365,8 @@ static void usage(void)
- 		"	-d --debug	log debuging info\n"
- 		"	-D --define	define global macro variable\n"
- 		/*"	-f --foreground do not fork into background\n" */
-+		"	-r --random-replicated-selection"
-+		"			use ramdom replicated server selection\n"
- 		"	-V --version	print version, build config and exit\n"
- 		, program);
- }
-@@ -1461,6 +1465,7 @@ int main(int argc, char *argv[])
- 		{"debug", 0, 0, 'd'},
- 		{"define", 1, 0, 'D'},
- 		{"foreground", 0, 0, 'f'},
-+		{"random-selection", 0, 0, 'r'},
- 		{"version", 0, 0, 'V'},
- 		{0, 0, 0, 0}
- 	};
-@@ -1476,10 +1481,11 @@ int main(int argc, char *argv[])
- 	timeout = defaults_get_timeout();
- 	ghost = defaults_get_browse_mode();
- 	logging = defaults_get_logging();
-+	random_selection = 0;
- 	foreground = 0;
- 
- 	opterr = 0;
--	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fV", long_options, NULL)) != EOF) {
-+	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fVr", long_options, NULL)) != EOF) {
- 		switch (opt) {
- 		case 'h':
- 			usage();
-@@ -1513,6 +1519,10 @@ int main(int argc, char *argv[])
- 			show_build_info();
- 			exit(0);
- 
-+		case 'r':
-+			random_selection = 1;
-+			break;
-+
- 		case '?':
- 		case ':':
- 			printf("%s: Ambiguous or unknown options\n", program);
-diff --git a/include/replicated.h b/include/replicated.h
-index 970cd31..c77cda6 100644
---- a/include/replicated.h
-+++ b/include/replicated.h
+--- autofs-5.0.1/include/replicated.h.random-selection	2007-03-16 16:27:36.000000000 +0900
++++ autofs-5.0.1/include/replicated.h	2007-03-16 16:27:54.000000000 +0900
 @@ -60,6 +60,7 @@ struct host {
  	struct host *next;
  };
@@ -64,38 +8,8 @@
  void free_host_list(struct host **);
  int parse_location(struct host **, const char *);
  int prune_host_list(struct host **, unsigned int, const char *);
-diff --git a/man/automount.8 b/man/automount.8
-index 9da82c4..59f2805 100644
---- a/man/automount.8
-+++ b/man/automount.8
-@@ -47,6 +47,10 @@ Define a global macro substitution variable. Global definitions
- are over-ridden macro definitions of the same name specified in
- mount entries.
- .TP
-+.I "\-r, \-\-random-replicated-selection"
-+Enables the use of ramdom selection when choosing a host from a
-+list of replicated servers.
-+.TP
- .I "\-V, \-\-version"
- Display the version number, then exit.
- .SH ARGUMENTS
-diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
-index 4063e9a..25f72b9 100644
---- a/modules/mount_nfs.c
-+++ b/modules/mount_nfs.c
-@@ -51,6 +51,8 @@ int mount_init(void **context)
- 	} else
- 		init_ctr++;
- 
-+	seed_random();
-+
- 	return !mount_bind;
- }
- 
-diff --git a/modules/replicated.c b/modules/replicated.c
-index cb65d82..de1b40c 100644
---- a/modules/replicated.c
-+++ b/modules/replicated.c
+--- autofs-5.0.1/modules/replicated.c.random-selection	2007-03-16 16:27:36.000000000 +0900
++++ autofs-5.0.1/modules/replicated.c	2007-03-16 16:27:54.000000000 +0900
 @@ -74,6 +74,29 @@
  #define max(x, y)	(x >= y ? x : y)
  #define mmax(x, y, z)	(max(x, y) == x ? max(x, z) : max(y, z))
@@ -126,7 +40,7 @@
  static unsigned int get_proximity(const char *host_addr, int addr_len)
  {
  	struct sockaddr_in *msk_addr, *if_addr;
-@@ -403,7 +426,11 @@ static unsigned int get_nfs_info(struct host *host,
+@@ -403,7 +426,11 @@ static unsigned int get_nfs_info(struct 
  		status = rpc_ping_proto(rpc_info);
  		gettimeofday(&end, &tz);
  		if (status) {
@@ -165,7 +79,7 @@
  			count++;
  			supported |= NFS2_SUPPORTED;
  		}
-@@ -610,8 +645,13 @@ static int get_supported_ver_and_cost(struct host *host, unsigned int version, c
+@@ -610,8 +645,13 @@ static int get_supported_ver_and_cost(st
  		gettimeofday(&start, &tz);
  		status = rpc_ping_proto(&rpc_info);
  		gettimeofday(&end, &tz);
@@ -181,3 +95,79 @@
  	}
  done:
  	if (rpc_info.proto->p_proto == IPPROTO_UDP) {
+--- autofs-5.0.1/modules/mount_nfs.c.random-selection	2007-03-16 16:27:36.000000000 +0900
++++ autofs-5.0.1/modules/mount_nfs.c	2007-03-16 16:27:54.000000000 +0900
+@@ -51,6 +51,8 @@ int mount_init(void **context)
+ 	} else
+ 		init_ctr++;
+ 
++	seed_random();
++
+ 	return !mount_bind;
+ }
+ 
+--- autofs-5.0.1/daemon/automount.c.random-selection	2007-03-16 16:27:36.000000000 +0900
++++ autofs-5.0.1/daemon/automount.c	2007-03-16 16:27:54.000000000 +0900
+@@ -48,6 +48,8 @@ const char *mapdir = AUTOFS_MAP_DIR;	/* 
+ const char *confdir = AUTOFS_CONF_DIR;	/* Location of autofs config file */
+ 
+ static char *pid_file = NULL;	/* File in which to keep pid */
++unsigned int random_selection;	/* use random policy when selecting
++				 * which multi-mount host to mount */
+ static int start_pipefd[2];
+ static int st_stat = 0;
+ static int *pst_stat = &st_stat;
+@@ -1363,6 +1365,8 @@ static void usage(void)
+ 		"	-d --debug	log debuging info\n"
+ 		"	-D --define	define global macro variable\n"
+ 		/*"	-f --foreground do not fork into background\n" */
++		"	-r --random-replicated-selection"
++		"			use ramdom replicated server selection\n"
+ 		"	-V --version	print version, build config and exit\n"
+ 		, program);
+ }
+@@ -1461,6 +1465,7 @@ int main(int argc, char *argv[])
+ 		{"debug", 0, 0, 'd'},
+ 		{"define", 1, 0, 'D'},
+ 		{"foreground", 0, 0, 'f'},
++		{"random-selection", 0, 0, 'r'},
+ 		{"version", 0, 0, 'V'},
+ 		{0, 0, 0, 0}
+ 	};
+@@ -1476,10 +1481,11 @@ int main(int argc, char *argv[])
+ 	timeout = defaults_get_timeout();
+ 	ghost = defaults_get_browse_mode();
+ 	logging = defaults_get_logging();
++	random_selection = 0;
+ 	foreground = 0;
+ 
+ 	opterr = 0;
+-	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fV", long_options, NULL)) != EOF) {
++	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fVr", long_options, NULL)) != EOF) {
+ 		switch (opt) {
+ 		case 'h':
+ 			usage();
+@@ -1513,6 +1519,10 @@ int main(int argc, char *argv[])
+ 			show_build_info();
+ 			exit(0);
+ 
++		case 'r':
++			random_selection = 1;
++			break;
++
+ 		case '?':
+ 		case ':':
+ 			printf("%s: Ambiguous or unknown options\n", program);
+--- autofs-5.0.1/man/automount.8.in.random-selection	2007-03-16 16:27:36.000000000 +0900
++++ autofs-5.0.1/man/automount.8.in	2007-03-16 16:27:54.000000000 +0900
+@@ -49,6 +49,10 @@ Define a global macro substitution varia
+ are over-ridden macro definitions of the same name specified in
+ mount entries.
+ .TP
++.I "\-r, \-\-random-replicated-selection"
++Enables the use of ramdom selection when choosing a host from a
++list of replicated servers.
++.TP
+ .I "\-V, \-\-version"
+ Display the version number, then exit.
+ .SH ARGUMENTS


