[PVFS2-CVS] commit by neill in pvfs2/src/apps/admin: pvfs2-event-mon-example.c pvfs2-export.c pvfs2-fs-dump.c pvfs2-import.c pvfs2-ls.c pvfs2-perf-mon-example.c pvfs2-ping.c pvfs2-set-debugmask.c pvfs2-set-eventmask.c pvfs2-set-mode.c pvfs2-statfs.c

CVS commit program cvs at parl.clemson.edu
Thu Mar 18 13:56:55 EST 2004


Update of /projects/cvsroot/pvfs2/src/apps/admin
In directory parlweb:/tmp/cvs-serv9309/src/apps/admin

Modified Files:
	pvfs2-event-mon-example.c pvfs2-export.c pvfs2-fs-dump.c 
	pvfs2-import.c pvfs2-ls.c pvfs2-perf-mon-example.c 
	pvfs2-ping.c pvfs2-set-debugmask.c pvfs2-set-eventmask.c 
	pvfs2-set-mode.c pvfs2-statfs.c 
Log Message:
- consolidate the credential generation in the admin tools
- added a generic/default credential generation function


Index: pvfs2-event-mon-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-event-mon-example.c,v
diff -p -u -r1.10 -r1.11
--- pvfs2-event-mon-example.c	9 Mar 2004 21:15:30 -0000	1.10
+++ pvfs2-event-mon-example.c	18 Mar 2004 18:56:55 -0000	1.11
@@ -4,11 +4,9 @@
  * See COPYING in top-level directory.
  */
 
-#include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -71,8 +69,7 @@ int main(int argc, char **argv)
 	return -1;
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     /* count how many I/O servers we have */
     ret = PVFS_mgmt_count_servers(cur_fs,

Index: pvfs2-export.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-export.c,v
diff -p -u -r1.29 -r1.30
--- pvfs2-export.c	9 Mar 2004 21:15:30 -0000	1.29
+++ pvfs2-export.c	18 Mar 2004 18:56:55 -0000	1.30
@@ -9,7 +9,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -107,8 +106,7 @@ int main(int argc, char **argv)
 
     memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
 
-    credentials.uid = getuid();
-    credentials.gid = getgid();
+    PVFS_util_gen_credentials(&credentials);
     lk_fs_id = cur_fs;
 
     /* TODO: this is awkward- the remove_base_dir() function

Index: pvfs2-fs-dump.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-fs-dump.c,v
diff -p -u -r1.25 -r1.26
--- pvfs2-fs-dump.c	17 Mar 2004 20:28:26 -0000	1.25
+++ pvfs2-fs-dump.c	18 Mar 2004 18:56:55 -0000	1.26
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -135,8 +134,7 @@ int main(int argc, char **argv)
 	return(-1);
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     /* count how many servers we have */
     ret = PVFS_mgmt_count_servers(cur_fs, creds, 

Index: pvfs2-import.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-import.c,v
diff -p -u -r1.49 -r1.50
--- pvfs2-import.c	9 Mar 2004 20:55:10 -0000	1.49
+++ pvfs2-import.c	18 Mar 2004 18:56:55 -0000	1.50
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -98,9 +97,11 @@ int main(int argc, char **argv)
 	goto main_out;
     }
 
+    PVFS_util_gen_credentials(&credentials);
+
     entry_name = str_buf;
-    attr.owner = getuid(); 
-    attr.group = getgid();
+    attr.owner = credentials.uid; 
+    attr.group = credentials.gid;
     attr.perms = PVFS_U_WRITE|PVFS_U_READ;
     attr.atime = time(NULL);
     attr.mtime = attr.atime;
@@ -109,8 +110,6 @@ int main(int argc, char **argv)
     attr.dfile_count = user_opts->num_datafiles;
     if(attr.dfile_count > 0)
 	attr.mask |= PVFS_ATTR_SYS_DFILE_COUNT;
-    credentials.uid = getuid();
-    credentials.gid = getgid();
 
     if (strcmp(pvfs_path,"/") == 0)
     {

Index: pvfs2-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-ls.c,v
diff -p -u -r1.41 -r1.42
--- pvfs2-ls.c	16 Mar 2004 21:33:44 -0000	1.41
+++ pvfs2-ls.c	18 Mar 2004 18:56:55 -0000	1.42
@@ -4,12 +4,10 @@
  * See COPYING in top-level directory.
  */
 
-#include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -418,15 +416,12 @@ void print_entry(
         return;
     }
 
-    memset(&getattr_response,0, sizeof(PVFS_sysresp_getattr));
-    memset(&credentials,0, sizeof(PVFS_credentials));
-
-    credentials.uid = getuid();
-    credentials.gid = getgid();
-
     pinode_refn.handle = handle;
     pinode_refn.fs_id = fs_id;
 
+    memset(&getattr_response,0, sizeof(PVFS_sysresp_getattr));
+    PVFS_util_gen_credentials(&credentials);
+
     ret = PVFS_sys_getattr(pinode_refn, PVFS_ATTR_SYS_ALL,
                            credentials, &getattr_response);
     if (ret)
@@ -456,10 +451,10 @@ int do_list(
     PVFS_ds_position token;
 
     name = start;
-    credentials.uid = getuid();
-    credentials.gid = getgid();
 
     memset(&lk_response,0,sizeof(PVFS_sysresp_lookup));
+    PVFS_util_gen_credentials(&credentials);
+
     if (PVFS_sys_lookup(fs_id, name, credentials,
                         &lk_response, PVFS2_LOOKUP_LINK_NO_FOLLOW))
     {
@@ -471,11 +466,8 @@ int do_list(
     pinode_refn.handle = lk_response.pinode_refn.handle;
     pinode_refn.fs_id = fs_id;
     pvfs_dirent_incount = MAX_NUM_DIRENTS;
-    credentials.uid = getuid();
-    credentials.gid = getgid();
 
     memset(&getattr_response,0,sizeof(PVFS_sysresp_getattr));
-
     if (PVFS_sys_getattr(pinode_refn, PVFS_ATTR_SYS_ALL,
                          credentials, &getattr_response) == 0)
     {

Index: pvfs2-perf-mon-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-perf-mon-example.c,v
diff -p -u -r1.16 -r1.17
--- pvfs2-perf-mon-example.c	9 Mar 2004 21:15:30 -0000	1.16
+++ pvfs2-perf-mon-example.c	18 Mar 2004 18:56:55 -0000	1.17
@@ -76,8 +76,7 @@ int main(int argc, char **argv)
 	return(-1);
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     /* count how many I/O servers we have */
     ret = PVFS_mgmt_count_servers(cur_fs, creds, PVFS_MGMT_IO_SERVER,

Index: pvfs2-ping.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-ping.c,v
diff -p -u -r1.33 -r1.34
--- pvfs2-ping.c	11 Mar 2004 22:19:20 -0000	1.33
+++ pvfs2-ping.c	18 Mar 2004 18:56:55 -0000	1.34
@@ -33,7 +33,8 @@ struct options
 
 static struct options* parse_args(int argc, char* argv[]);
 static void usage(int argc, char** argv);
-static void print_mntent(struct PVFS_sys_mntent *entries, int num_entries);
+static void print_mntent(
+    struct PVFS_sys_mntent *entries, int num_entries);
 static int print_config(PVFS_fs_id fsid);
 static int noop_all_servers(PVFS_fs_id fsid);
 
@@ -77,8 +78,9 @@ int main(int argc, char **argv)
 	return(-1);
     }
 
-    printf("\n(3) Initializing each file system found in tab file: %s...\n\n",
-	tab->tabfile_name);
+    printf("\n(3) Initializing each file system found "
+           "in tab file: %s...\n\n", tab->tabfile_name);
+
     for(i=0; i<tab->mntent_count; i++)
     {
 	printf("   %s: ", tab->mntent_array[i].mnt_dir);
@@ -86,8 +88,8 @@ int main(int argc, char **argv)
 	if(ret < 0)
 	{
 	    printf("FAILURE!\n");
-	    fprintf(stderr, "Failure: could not initialize at least one of"
-		" the target file systems.\n");
+	    fprintf(stderr, "Failure: could not initialize at "
+                    "least one of the target file systems.\n");
 	    return(-1);
 	}
 	else
@@ -111,8 +113,7 @@ int main(int argc, char **argv)
 
     print_mntent(tab->mntent_array, tab->mntent_count);
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     /* dump some key parts of the config file */
     ret = print_config(cur_fs);
@@ -130,25 +131,28 @@ int main(int argc, char **argv)
     if(ret < 0)
     {
 	PVFS_perror("noop_all_servers", ret);
-	fprintf(stderr, "Failure: could not communicate with one of the servers.\n");
+	fprintf(stderr, "Failure: could not communicate with "
+                "one of the servers.\n");
 	return(-1);
     }
 
-    printf("\n(6) Verifying that fsid %ld is accemntentle to all servers...\n",
-	(long)cur_fs);
+    printf("\n(6) Verifying that fsid %ld is acceptable "
+           "to all servers...\n",(long)cur_fs);
 
     /* check that the fsid exists on all of the servers */
     /* TODO: we need a way to get information out about which server fails
      * in error cases here 
      */
-    ret = PVFS_mgmt_setparam_all(cur_fs, creds, PVFS_SERV_PARAM_FSID_CHECK,
-	(int64_t)cur_fs, NULL);
+    ret = PVFS_mgmt_setparam_all(
+        cur_fs, creds, PVFS_SERV_PARAM_FSID_CHECK,
+        (int64_t)cur_fs, NULL);
     if(ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_setparam_all", ret);
 	fprintf(stderr, "Failure: not all servers accepted fsid %ld\n", 
 	    (long)cur_fs);
-	fprintf(stderr, "TODO: need a way to tell which servers couldn't find the fs_id...\n");
+	fprintf(stderr, "TODO: need a way to tell which "
+                "servers couldn't find the fs_id...\n");
 	return(-1);
     }
     printf("\n   Ok; all servers understand fs_id %ld\n", (long)cur_fs);
@@ -166,16 +170,18 @@ int main(int argc, char **argv)
     printf("\n   Root handle: %Lu\n", Lu(resp_lookup.pinode_refn.handle));
 
     /* check that only one server controls root handle */
-    /* TODO: we need a way to get information out about which server failed
-     * in error cases here 
+    /* TODO: we need a way to get information out about which server
+     * failed in error cases here
      */
-    ret = PVFS_mgmt_setparam_all(cur_fs, creds, PVFS_SERV_PARAM_ROOT_CHECK,
+    ret = PVFS_mgmt_setparam_all(
+        cur_fs, creds, PVFS_SERV_PARAM_ROOT_CHECK,
 	(int64_t)resp_lookup.pinode_refn.handle, NULL);
 
     /* check for understood error values */
     if(ret == -PVFS_ENOENT)
     {
-	fprintf(stderr, "Failure: no servers claimed ownership of root handle.\n");
+	fprintf(stderr, "Failure: no servers claimed "
+                "ownership of root handle.\n");
 	return(-1);
     }
     if(ret == -PVFS_EALREADY)
@@ -196,10 +202,11 @@ int main(int argc, char **argv)
 
     PVFS_sys_finalize();
 
-    printf("=============================================================\n");
-
-    printf("\nThe PVFS filesystem at %s appears to be correctly configured.\n\n",
-	user_opts->fs_path_real);
+    printf("=========================================="
+           "===================\n");
+    printf("\nThe PVFS filesystem at %s appears to be "
+           "correctly configured.\n\n",
+           user_opts->fs_path_real);
 	
     return(ret);
 }
@@ -220,28 +227,26 @@ static int noop_all_servers(PVFS_fs_id f
     int i;
     int tmp;
  
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     printf("\n   meta servers:\n");
-    ret = PVFS_mgmt_count_servers(fsid, creds, PVFS_MGMT_META_SERVER, &count);
+    ret = PVFS_mgmt_count_servers(
+        fsid, creds, PVFS_MGMT_META_SERVER, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_count_servers()", ret);
 	return ret;
     }
-    addr_array = (PVFS_BMI_addr_t *) malloc(count * sizeof(PVFS_BMI_addr_t));
+    addr_array = (PVFS_BMI_addr_t *) malloc(
+        count * sizeof(PVFS_BMI_addr_t));
     if (addr_array == NULL)
     {
 	perror("malloc");
 	return -PVFS_ENOMEM;
     }
 
-    ret = PVFS_mgmt_get_server_array(fsid,
-				     creds,
-				     PVFS_MGMT_META_SERVER,
-                                     addr_array,
-				     &count);
+    ret = PVFS_mgmt_get_server_array(
+        fsid, creds, PVFS_MGMT_META_SERVER, addr_array, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_get_server_array()", ret);
@@ -250,7 +255,8 @@ static int noop_all_servers(PVFS_fs_id f
 
     for (i = 0; i < count; i++)
     {
-	printf("   %s ", PVFS_mgmt_map_addr(fsid, creds, addr_array[i], &tmp));
+	printf("   %s ",
+               PVFS_mgmt_map_addr(fsid, creds, addr_array[i], &tmp));
 	ret = PVFS_mgmt_noop(fsid, creds, addr_array[i]);
 	if (ret == 0)
 	{
@@ -265,24 +271,23 @@ static int noop_all_servers(PVFS_fs_id f
     free(addr_array);
 
     printf("\n   data servers:\n");
-    ret = PVFS_mgmt_count_servers(fsid, creds, PVFS_MGMT_IO_SERVER, &count);
+    ret = PVFS_mgmt_count_servers(
+        fsid, creds, PVFS_MGMT_IO_SERVER, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_count_servers()", ret);
 	return ret;
     }
-    addr_array = (PVFS_BMI_addr_t *) malloc(count * sizeof(PVFS_BMI_addr_t));
+    addr_array = (PVFS_BMI_addr_t *)malloc(
+        count * sizeof(PVFS_BMI_addr_t));
     if (addr_array == NULL)
     {
 	perror("malloc");
 	return -PVFS_ENOMEM;
     }
 
-    ret = PVFS_mgmt_get_server_array(fsid,
-				     creds,
-				     PVFS_MGMT_IO_SERVER,
-				     addr_array,
-				     &count);
+    ret = PVFS_mgmt_get_server_array(
+        fsid, creds, PVFS_MGMT_IO_SERVER, addr_array, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_get_server_array()", ret);
@@ -325,31 +330,26 @@ static int print_config(PVFS_fs_id fsid)
     int count;
     PVFS_BMI_addr_t *addr_array;
  
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     printf("\n   meta servers:\n");
-    ret = PVFS_mgmt_count_servers(fsid,
-				  creds,
-				  PVFS_MGMT_META_SERVER,
-				  &count);
+    ret = PVFS_mgmt_count_servers(
+        fsid, creds, PVFS_MGMT_META_SERVER, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_count_servers()", ret);
 	return ret;
     }
-    addr_array = (PVFS_BMI_addr_t *)malloc(count * sizeof(PVFS_BMI_addr_t));
+    addr_array = (PVFS_BMI_addr_t *)malloc(
+        count * sizeof(PVFS_BMI_addr_t));
     if (addr_array == NULL)
     {
 	perror("malloc");
 	return -PVFS_ENOMEM;
     }
 
-    ret = PVFS_mgmt_get_server_array(fsid,
-				     creds,
-				     PVFS_MGMT_META_SERVER,
-				     addr_array,
-				     &count);
+    ret = PVFS_mgmt_get_server_array(
+        fsid, creds, PVFS_MGMT_META_SERVER, addr_array, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_get_server_array()", ret);
@@ -358,29 +358,29 @@ static int print_config(PVFS_fs_id fsid)
 
     for (i=0; i<count; i++)
     {
-	printf("   %s\n", PVFS_mgmt_map_addr(fsid, creds, addr_array[i], &tmp));
+	printf("   %s\n",
+               PVFS_mgmt_map_addr(fsid, creds, addr_array[i], &tmp));
     }
     free(addr_array);
 
     printf("\n   data servers:\n");
-    ret = PVFS_mgmt_count_servers(fsid, creds, PVFS_MGMT_IO_SERVER, &count);
+    ret = PVFS_mgmt_count_servers(
+        fsid, creds, PVFS_MGMT_IO_SERVER, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_count_servers()", ret);
 	return ret;
     }
-    addr_array = (PVFS_BMI_addr_t *)malloc(count * sizeof(PVFS_BMI_addr_t));
+    addr_array = (PVFS_BMI_addr_t *)malloc(
+        count * sizeof(PVFS_BMI_addr_t));
     if (addr_array == NULL)
     {
 	perror("malloc");
 	return -PVFS_ENOMEM;
     }
 
-    ret = PVFS_mgmt_get_server_array(fsid,
-				     creds,
-				     PVFS_MGMT_IO_SERVER,
-				     addr_array,
-				     &count);
+    ret = PVFS_mgmt_get_server_array(
+        fsid, creds, PVFS_MGMT_IO_SERVER, addr_array, &count);
     if (ret < 0)
     {
 	PVFS_perror("PVFS_mgmt_get_server_array()", ret);
@@ -389,7 +389,8 @@ static int print_config(PVFS_fs_id fsid)
 
     for(i=0; i<count; i++)
     {
-	printf("   %s\n", PVFS_mgmt_map_addr(fsid, creds, addr_array[i], &tmp));
+	printf("   %s\n",
+               PVFS_mgmt_map_addr(fsid, creds, addr_array[i], &tmp));
     }
     free(addr_array);
 

Index: pvfs2-set-debugmask.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-debugmask.c,v
diff -p -u -r1.15 -r1.16
--- pvfs2-set-debugmask.c	9 Mar 2004 21:15:30 -0000	1.15
+++ pvfs2-set-debugmask.c	18 Mar 2004 18:56:55 -0000	1.16
@@ -67,11 +67,11 @@ int main(int argc, char **argv)
 	return(-1);
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
-    ret = PVFS_mgmt_setparam_all(cur_fs, creds, PVFS_SERV_PARAM_GOSSIP_MASK,
-	user_opts->debug_mask, NULL);
+    ret = PVFS_mgmt_setparam_all(
+        cur_fs, creds, PVFS_SERV_PARAM_GOSSIP_MASK,
+        user_opts->debug_mask, NULL);
 
     PVFS_sys_finalize();
 

Index: pvfs2-set-eventmask.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-eventmask.c,v
diff -p -u -r1.7 -r1.8
--- pvfs2-set-eventmask.c	9 Mar 2004 21:15:30 -0000	1.7
+++ pvfs2-set-eventmask.c	18 Mar 2004 18:56:55 -0000	1.8
@@ -47,7 +47,8 @@ int main(int argc, char **argv)
     user_opts = parse_args(argc, argv);
     if(!user_opts)
     {
-	fprintf(stderr, "Error: failed to parse command line arguments.\n");
+	fprintf(stderr, "Error: failed to parse command "
+                "line arguments.\n");
 	usage(argc, argv);
 	return(-1);
     }
@@ -64,13 +65,12 @@ int main(int argc, char **argv)
         &cur_fs, pvfs_path, PVFS_NAME_MAX);
     if(ret < 0)
     {
-	fprintf(stderr, "Error: could not find filesystem for %s in pvfstab\n", 
-	    user_opts->mnt_point);
+	fprintf(stderr, "Error: could not find filesystem "
+                "for %s in pvfstab\n", user_opts->mnt_point);
 	return(-1);
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     if(!user_opts->op_mask || !user_opts->api_mask)
     {
@@ -201,10 +201,10 @@ static struct options* parse_args(int ar
 static void usage(int argc, char** argv)
 {
     fprintf(stderr, "\n");
-    fprintf(stderr, "Usage  : %s [-m fs_mount_point] [-a hex_api_mask] [-o hex_operation_mask]\n",
-	argv[0]);
+    fprintf(stderr, "Usage  : %s [-m fs_mount_point] "
+            "[-a hex_api_mask] [-o hex_operation_mask]\n", argv[0]);
     fprintf(stderr, "Example: %s -m /mnt/pvfs2 -a 0xFFFF -o 0xFFFF\n",
-	argv[0]);
+            argv[0]);
     return;
 }
 

Index: pvfs2-set-mode.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-mode.c,v
diff -p -u -r1.8 -r1.9
--- pvfs2-set-mode.c	9 Mar 2004 21:15:30 -0000	1.8
+++ pvfs2-set-mode.c	18 Mar 2004 18:56:55 -0000	1.9
@@ -67,11 +67,10 @@ int main(int argc, char **argv)
 	return(-1);
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
-    ret = PVFS_mgmt_setparam_all(cur_fs, creds, PVFS_SERV_PARAM_MODE,
-	user_opts->mode, NULL);
+    ret = PVFS_mgmt_setparam_all(
+        cur_fs, creds, PVFS_SERV_PARAM_MODE, user_opts->mode, NULL);
 
     PVFS_sys_finalize();
 

Index: pvfs2-statfs.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-statfs.c,v
diff -p -u -r1.19 -r1.20
--- pvfs2-statfs.c	9 Mar 2004 21:15:30 -0000	1.19
+++ pvfs2-statfs.c	18 Mar 2004 18:56:55 -0000	1.20
@@ -78,8 +78,7 @@ int main(int argc, char **argv)
 	return(-1);
     }
 
-    creds.uid = getuid();
-    creds.gid = getgid();
+    PVFS_util_gen_credentials(&creds);
 
     /* gather normal statfs statistics from system interface */
     ret = PVFS_sys_statfs(cur_fs, creds, &resp_statfs);
@@ -140,10 +139,8 @@ int main(int argc, char **argv)
 	    server_type = PVFS_MGMT_IO_SERVER;
 	}
 
-	ret = PVFS_mgmt_count_servers(cur_fs,
-				      creds,
-				      server_type,
-				      &outcount);
+	ret = PVFS_mgmt_count_servers(
+            cur_fs, creds, server_type, &outcount);
 	if (ret < 0)
 	{
 	    PVFS_perror("PVFS_mgmt_count_servers", ret);
@@ -158,23 +155,16 @@ int main(int argc, char **argv)
 	    return -1;
 	}
 
-	ret = PVFS_mgmt_get_server_array(cur_fs,
-					 creds,
-					 server_type,
-					 addr_array,
-					 &outcount);
+	ret = PVFS_mgmt_get_server_array(
+            cur_fs, creds, server_type, addr_array, &outcount);
 	if (ret < 0)
 	{
 	    PVFS_perror("PVFS_mgmt_get_server_array", ret);
 	    return -1;
 	}
 
-	ret = PVFS_mgmt_statfs_list(cur_fs,
-				    creds,
-				    stat_array,
-				    addr_array,
-				    NULL, /* error array */
-				    outcount);
+	ret = PVFS_mgmt_statfs_list(
+            cur_fs, creds, stat_array, addr_array, NULL, outcount);
 	if (ret < 0)
 	{
 	    PVFS_perror("PVFS_mgmt_statfs_list", ret);



More information about the PVFS2-CVS mailing list