[Pvfs2-cvs] commit by slang in pvfs2/src/proto: PINT-le-bytefield.c pvfs2-req-proto.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/proto
In directory parlweb1:/tmp/cvs-serv10274/src/proto

Modified Files:
	PINT-le-bytefield.c pvfs2-req-proto.h 
Log Message:
commit of Murali's unifying config file patch.  Also adding a convert script for converting to the new single fs.conf format.


Index: PINT-le-bytefield.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/proto/PINT-le-bytefield.c,v
diff -p -u -r1.51 -r1.52
--- PINT-le-bytefield.c	24 Jul 2007 17:16:21 -0000	1.51
+++ PINT-le-bytefield.c	17 Aug 2007 04:04:27 -0000	1.52
@@ -92,7 +92,6 @@ static void lebf_initialize(void)
 		continue;
 	    case PVFS_SERV_GETCONFIG:
 		resp.u.getconfig.fs_config_buf = tmp_name;
-		resp.u.getconfig.server_config_buf = tmp_name;
 		respsize = extra_size_PVFS_servresp_getconfig;
 		break;
 	    case PVFS_SERV_LOOKUP_PATH:

Index: pvfs2-req-proto.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/proto/pvfs2-req-proto.h,v
diff -p -u -r1.150 -r1.151
--- pvfs2-req-proto.h	18 Jul 2007 20:44:32 -0000	1.150
+++ pvfs2-req-proto.h	17 Aug 2007 04:04:27 -0000	1.151
@@ -697,17 +697,14 @@ struct PVFS_servresp_getconfig
 {
     char *fs_config_buf;
     uint32_t fs_config_buf_size;
-    char *server_config_buf;
-    uint32_t server_config_buf_size;
 };
-endecode_fields_4_struct(
+endecode_fields_3_struct(
     PVFS_servresp_getconfig,
     uint32_t, fs_config_buf_size,
-    uint32_t, server_config_buf_size,
-    string, fs_config_buf,
-    string, server_config_buf)
+    skip4,,
+    string, fs_config_buf)
 #define extra_size_PVFS_servresp_getconfig \
-    (2 * PVFS_REQ_LIMIT_CONFIG_FILE_BYTES)
+    (PVFS_REQ_LIMIT_CONFIG_FILE_BYTES)
 
 /* truncate ****************************************************/
 /* - resizes an existing datafile */