[Pvfs2-cvs] commit by kunkel in pvfs2/src/apps/admin: pvfs2-chmod.c
pvfs2-chown.c pvfs2-cp.c pvfs2-event-mon-example.c
pvfs2-fs-dump.c pvfs2-fsck.c pvfs2-ln.c pvfs2-ls.c
pvfs2-mkdir.c pvfs2-perf-mon-example.c pvfs2-ping.c
pvfs2-remove-object.c pvfs2-rm.c pvfs2-set-debugmask.c
pvfs2-set-eventmask.c pvfs2-set-mode.c pvfs2-set-sync.c
pvfs2-stat.c pvfs2-statfs.c pvfs2-touch.c pvfs2-viewdist.c
CVS commit program
cvs at parl.clemson.edu
Sat Aug 19 09:09:33 EDT 2006
Update of /projects/cvsroot/pvfs2/src/apps/admin
In directory parlweb1:/tmp/cvs-serv3901/src/apps/admin
Modified Files:
Tag: kunkel-branch
pvfs2-chmod.c pvfs2-chown.c pvfs2-cp.c
pvfs2-event-mon-example.c pvfs2-fs-dump.c pvfs2-fsck.c
pvfs2-ln.c pvfs2-ls.c pvfs2-mkdir.c pvfs2-perf-mon-example.c
pvfs2-ping.c pvfs2-remove-object.c pvfs2-rm.c
pvfs2-set-debugmask.c pvfs2-set-eventmask.c pvfs2-set-mode.c
pvfs2-set-sync.c pvfs2-stat.c pvfs2-statfs.c pvfs2-touch.c
pvfs2-viewdist.c
Log Message:
Added PVFS-hint, changed tests for pwrite/odirect/transactions/aio dbpf
support to allow users to explicitly enable or disable the functionality.
In the aio implementation is a bug since somebody else modified it.
Index: pvfs2-chmod.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-chmod.c,v
diff -p -u -r1.4.6.2 -r1.4.6.3
--- pvfs2-chmod.c 24 Jul 2006 17:20:14 -0000 1.4.6.2
+++ pvfs2-chmod.c 19 Aug 2006 13:09:32 -0000 1.4.6.3
@@ -108,7 +108,7 @@ int pvfs2_chmod (PVFS_permissions perms,
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
ret = PVFS_sys_lookup(cur_fs, pvfs_path,
&credentials, &resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_lookup", ret);
@@ -147,7 +147,7 @@ int pvfs2_chmod (PVFS_permissions perms,
ret = PVFS_sys_ref_lookup(parent_ref.fs_id, str_buf,
parent_ref, &credentials, &resp_lookup,
- PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if (ret != 0)
{
fprintf(stderr, "Target '%s' does not exist!\n", str_buf);
@@ -156,7 +156,7 @@ int pvfs2_chmod (PVFS_permissions perms,
memset(&resp_getattr,0,sizeof(PVFS_sysresp_getattr));
attrmask = (PVFS_ATTR_SYS_ALL_SETABLE);
- ret = PVFS_sys_getattr(resp_lookup.ref,attrmask,&credentials,&resp_getattr);
+ ret = PVFS_sys_getattr(resp_lookup.ref,attrmask,&credentials,&resp_getattr, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_getattr",ret);
@@ -168,7 +168,7 @@ int pvfs2_chmod (PVFS_permissions perms,
new_attr.perms = perms;
new_attr.mask = PVFS_ATTR_SYS_PERM;
- ret = PVFS_sys_setattr(resp_lookup.ref,new_attr,&credentials);
+ ret = PVFS_sys_setattr(resp_lookup.ref,new_attr,&credentials, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_setattr",ret);
Index: pvfs2-chown.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-chown.c,v
diff -p -u -r1.3.6.2 -r1.3.6.3
--- pvfs2-chown.c 24 Jul 2006 17:20:14 -0000 1.3.6.2
+++ pvfs2-chown.c 19 Aug 2006 13:09:32 -0000 1.3.6.3
@@ -114,7 +114,7 @@ int pvfs2_chown (PVFS_uid owner, PVFS_gi
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
ret = PVFS_sys_lookup(cur_fs, pvfs_path,
&credentials, &resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_lookup", ret);
@@ -153,7 +153,7 @@ int pvfs2_chown (PVFS_uid owner, PVFS_gi
ret = PVFS_sys_ref_lookup(parent_ref.fs_id, str_buf,
parent_ref, &credentials, &resp_lookup,
- PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if (ret != 0)
{
fprintf(stderr, "Target '%s' does not exist!\n", str_buf);
@@ -162,7 +162,7 @@ int pvfs2_chown (PVFS_uid owner, PVFS_gi
memset(&resp_getattr,0,sizeof(PVFS_sysresp_getattr));
attrmask = (PVFS_ATTR_SYS_ALL_SETABLE);
- ret = PVFS_sys_getattr(resp_lookup.ref,attrmask,&credentials,&resp_getattr);
+ ret = PVFS_sys_getattr(resp_lookup.ref,attrmask,&credentials,&resp_getattr, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_getattr",ret);
@@ -175,7 +175,7 @@ int pvfs2_chown (PVFS_uid owner, PVFS_gi
new_attr.group = group;
new_attr.mask = PVFS_ATTR_SYS_UID | PVFS_ATTR_SYS_GID;
- ret = PVFS_sys_setattr(resp_lookup.ref,new_attr,&credentials);
+ ret = PVFS_sys_setattr(resp_lookup.ref,new_attr,&credentials, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_setattr",ret);
Index: pvfs2-cp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-cp.c,v
diff -p -u -r1.19.4.3 -r1.19.4.4
--- pvfs2-cp.c 18 Aug 2006 05:11:58 -0000 1.19.4.3
+++ pvfs2-cp.c 19 Aug 2006 13:09:32 -0000 1.19.4.4
@@ -331,7 +331,7 @@ static size_t generic_read(file_object *
return (ret);
}
ret = PVFS_sys_read(src->u.pvfs2.ref, file_req, offset,
- buffer, mem_req, credentials, &resp_io);
+ buffer, mem_req, credentials, &resp_io, NULL);
if (ret == 0)
{
PVFS_Request_free(&mem_req);
@@ -363,7 +363,7 @@ static size_t generic_write(file_object
return(ret);
}
ret = PVFS_sys_write(dest->u.pvfs2.ref, file_req, offset,
- buffer, mem_req, credentials, &resp_io);
+ buffer, mem_req, credentials, &resp_io, NULL);
if (ret == 0)
{
PVFS_Request_free(&mem_req);
@@ -484,7 +484,7 @@ static int generic_open(file_object *obj
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
ret = PVFS_sys_lookup(obj->u.pvfs2.fs_id, obj->u.pvfs2.pvfs2_path,
credentials, &resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_lookup", ret);
@@ -553,13 +553,13 @@ static int generic_open(file_object *obj
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
ret = PVFS_sys_ref_lookup(parent_ref.fs_id, entry_name,
parent_ref, credentials, &resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if ((ret == 0) && (open_type == OPEN_SRC))
{
memset(&resp_getattr, 0, sizeof(PVFS_sysresp_getattr));
ret = PVFS_sys_getattr(resp_lookup.ref, PVFS_ATTR_SYS_ALL_NOHINT,
- credentials, &resp_getattr);
+ credentials, &resp_getattr, NULL);
if (ret)
{
fprintf(stderr, "Failed to do pvfs2 getattr on %s\n",
@@ -628,7 +628,7 @@ static int generic_open(file_object *obj
ret = PVFS_sys_create(entry_name, parent_ref,
obj->u.pvfs2.attr, credentials,
- new_dist, &resp_create);
+ new_dist, &resp_create, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_create", ret);
@@ -662,7 +662,7 @@ static int generic_cleanup(file_object *
/* preserve permissions doing a pvfs2 => pvfs2 copy */
if ((src->fs_type == PVFS2_FILE) && (dest->fs_type == PVFS2_FILE))
{
- PVFS_sys_setattr(dest->u.pvfs2.ref, src->u.pvfs2.attr, credentials);
+ PVFS_sys_setattr(dest->u.pvfs2.ref, src->u.pvfs2.attr, credentials, NULL);
}
if ((src->fs_type == UNIX_FILE) && (src->u.ufs.fd != -1))
Index: pvfs2-event-mon-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-event-mon-example.c,v
diff -p -u -r1.16.20.2 -r1.16.20.3
--- pvfs2-event-mon-example.c 24 Jul 2006 17:20:14 -0000 1.16.20.2
+++ pvfs2-event-mon-example.c 19 Aug 2006 13:09:32 -0000 1.16.20.3
@@ -129,7 +129,8 @@ int main(int argc, char **argv)
addr_array,
io_server_count,
EVENT_DEPTH,
- NULL /* detailed errors */);
+ NULL /* detailed errors */
+ , NULL);
if (ret < 0)
{
PVFS_perror("PVFS_mgmt_event_mon_list", EVENT_DEPTH);
Index: pvfs2-fs-dump.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-fs-dump.c,v
diff -p -u -r1.43.4.2 -r1.43.4.3
--- pvfs2-fs-dump.c 24 Jul 2006 17:20:14 -0000 1.43.4.2
+++ pvfs2-fs-dump.c 19 Aug 2006 13:09:32 -0000 1.43.4.3
@@ -174,7 +174,8 @@ int main(int argc, char **argv)
addr_array,
NULL,
server_count,
- NULL /* detailed errors */);
+ NULL /* detailed errors */
+ , NULL);
if (ret != 0)
{
PVFS_perror("PVFS_mgmt_setparam_list", ret);
@@ -185,7 +186,7 @@ int main(int argc, char **argv)
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return(-1);
}
@@ -221,7 +222,7 @@ int main(int argc, char **argv)
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
PVFS_sys_finalize();
@@ -254,7 +255,7 @@ int build_handlelist(PVFS_fs_id cur_fs,
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return -1;
}
@@ -263,7 +264,8 @@ int build_handlelist(PVFS_fs_id cur_fs,
stat_array,
addr_array,
server_count,
- NULL /* details */);
+ NULL /* details */
+ , NULL);
if (ret != 0)
{
PVFS_perror("PVFS_mgmt_statfs_list", ret);
@@ -274,7 +276,7 @@ int build_handlelist(PVFS_fs_id cur_fs,
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return -1;
}
@@ -348,7 +350,8 @@ int build_handlelist(PVFS_fs_id cur_fs,
position_array,
addr_array,
server_count,
- NULL /* details */);
+ NULL /* details */
+ , NULL);
if (ret < 0)
{
PVFS_perror("PVFS_mgmt_iterate_handles_list", ret);
@@ -359,7 +362,7 @@ int build_handlelist(PVFS_fs_id cur_fs,
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return -1;
}
@@ -434,14 +437,14 @@ int traverse_directory_tree(PVFS_fs_id c
PVFS_object_ref pref;
PVFS_sys_lookup(cur_fs, "/", creds,
- &lookup_resp, PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ &lookup_resp, PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
/* lookup_resp.pinode_refn.handle gets root handle */
pref = lookup_resp.ref;
PVFS_sys_getattr(pref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp);
+ &getattr_resp, NULL);
if (getattr_resp.attr.objtype != PVFS_TYPE_DIRECTORY)
{
@@ -490,7 +493,7 @@ int descend(PVFS_fs_id cur_fs,
(!token ? PVFS_READDIR_START : token),
count,
creds,
- &readdir_resp);
+ &readdir_resp, NULL);
for (i = 0; i < readdir_resp.pvfs_dirent_outcount; i++)
{
@@ -507,7 +510,7 @@ int descend(PVFS_fs_id cur_fs,
if ((ret = PVFS_sys_getattr(entry_ref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp)) != 0)
+ &getattr_resp, NULL)) != 0)
{
printf("Could not get attributes of handle %llu [%d]\n",
llu(cur_handle), ret);
@@ -585,7 +588,7 @@ void verify_datafiles(PVFS_fs_id cur_fs,
printf("invalid value of number of datafiles = %d\n", df_count);
assert(0);
}
- ret = PVFS_mgmt_get_dfile_array(mf_ref, creds, df_handles, df_count);
+ ret = PVFS_mgmt_get_dfile_array(mf_ref, creds, df_handles, df_count, NULL);
if (ret != 0)
{
assert(0);
@@ -638,7 +641,7 @@ void analyze_remaining_handles(PVFS_fs_i
/* only remaining handles are dirdata */
PVFS_sys_getattr(entry_ref,
PVFS_ATTR_SYS_ALL,
- creds, &getattr_resp);
+ creds, &getattr_resp, NULL);
if (getattr_resp.attr.objtype != PVFS_TYPE_DIRDATA)
{
flag = 0;
Index: pvfs2-fsck.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-fsck.c,v
diff -p -u -r1.16.4.3 -r1.16.4.4
--- pvfs2-fsck.c 18 Aug 2006 05:11:58 -0000 1.16.4.3
+++ pvfs2-fsck.c 19 Aug 2006 13:09:32 -0000 1.16.4.4
@@ -130,7 +130,8 @@ int main(int argc, char **argv)
addr_array,
NULL,
server_count,
- NULL /* detailed errors */);
+ NULL /* detailed errors */
+ , NULL);
if (ret != 0)
{
PVFS_perror("PVFS_mgmt_setparam_list", ret);
@@ -185,7 +186,7 @@ int main(int argc, char **argv)
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
in_admin_mode = 0;
/* third pass moves salvagable objects into lost+found:
@@ -220,7 +221,7 @@ int main(int argc, char **argv)
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
}
PVFS_sys_finalize();
@@ -258,7 +259,7 @@ struct handlelist *build_handlelist(PVFS
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return NULL;
}
@@ -267,7 +268,8 @@ struct handlelist *build_handlelist(PVFS
stat_array,
addr_array,
server_count,
- NULL /* details */);
+ NULL /* details */
+ , NULL);
if (ret != 0)
{
PVFS_perror("PVFS_mgmt_statfs_list", ret);
@@ -278,7 +280,7 @@ struct handlelist *build_handlelist(PVFS
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return NULL;
}
@@ -353,7 +355,7 @@ struct handlelist *build_handlelist(PVFS
position_array,
addr_array,
server_count,
- NULL /* details */);
+ NULL /* details */, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_mgmt_iterate_handles_list", ret);
@@ -364,7 +366,7 @@ struct handlelist *build_handlelist(PVFS
addr_array,
NULL,
server_count,
- NULL);
+ NULL, NULL);
return NULL;
}
@@ -443,7 +445,7 @@ int traverse_directory_tree(PVFS_fs_id c
"/",
creds,
&lookup_resp,
- PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
assert(ret == 0);
pref = lookup_resp.ref;
@@ -451,7 +453,7 @@ int traverse_directory_tree(PVFS_fs_id c
PVFS_sys_getattr(pref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp);
+ &getattr_resp, NULL);
assert(getattr_resp.attr.objtype == PVFS_TYPE_DIRECTORY);
assert(handlelist_find_handle(hl, pref.handle, &server_idx) == 0);
@@ -484,7 +486,7 @@ int match_dirdata(struct handlelist *hl,
ret = PVFS_mgmt_get_dirdata_handle(dir_ref,
&dirdata_handle,
- creds);
+ creds, NULL);
if (ret != 0)
{
PVFS_perror("match_dirdata", ret);
@@ -528,7 +530,7 @@ int descend(PVFS_fs_id cur_fs,
(!token ? PVFS_READDIR_START : token),
count,
creds,
- &readdir_resp);
+ &readdir_resp, NULL);
for (i = 0; i < readdir_resp.pvfs_dirent_outcount; i++)
{
@@ -567,7 +569,7 @@ int descend(PVFS_fs_id cur_fs,
ret = PVFS_sys_getattr(entry_ref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp);
+ &getattr_resp, NULL);
if (ret != 0) {
ret = remove_directory_entry(dir_ref,
entry_ref,
@@ -704,7 +706,7 @@ int verify_datafiles(PVFS_fs_id cur_fs,
{
assert(0);
}
- ret = PVFS_mgmt_get_dfile_array(mf_ref, creds, df_handles, df_count);
+ ret = PVFS_mgmt_get_dfile_array(mf_ref, creds, df_handles, df_count, NULL);
if (ret != 0)
{
/* what does this mean? */
@@ -797,7 +799,7 @@ struct handlelist *find_sub_trees(PVFS_f
ret = PVFS_sys_getattr(handle_ref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp);
+ &getattr_resp, NULL);
if (ret) {
/* remove anything we can't get attributes on */
ret = remove_object(handle_ref,
@@ -878,7 +880,7 @@ struct handlelist *fill_lost_and_found(P
ret = PVFS_sys_getattr(handle_ref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp);
+ &getattr_resp, NULL);
if (ret) {
printf("warning: problem calling getattr on %llu; assuming datafile for now.\n",
llu(handle));
@@ -989,7 +991,7 @@ void cull_leftovers(PVFS_fs_id cur_fs,
ret = PVFS_sys_getattr(handle_ref,
PVFS_ATTR_SYS_ALL_NOHINT,
creds,
- &getattr_resp);
+ &getattr_resp, NULL);
if (ret) {
printf("warning: problem calling getattr on %llu\n",
llu(handle));
@@ -1025,7 +1027,7 @@ int create_lost_and_found(PVFS_fs_id cur
"/lost+found",
creds,
&lookup_resp,
- PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if (ret == 0) {
laf_ref = lookup_resp.ref;
return 0;
@@ -1041,7 +1043,7 @@ int create_lost_and_found(PVFS_fs_id cur
"/",
creds,
&lookup_resp,
- PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
assert(ret == 0);
root_ref = lookup_resp.ref;
@@ -1054,7 +1056,7 @@ int create_lost_and_found(PVFS_fs_id cur
root_ref,
attr,
creds,
- &mkdir_resp);
+ &mkdir_resp, NULL);
if (ret == 0) {
laf_ref = mkdir_resp.ref;
}
@@ -1083,7 +1085,7 @@ int create_dirent(PVFS_object_ref dir_re
ret = PVFS_mgmt_create_dirent(dir_ref,
name,
handle,
- creds);
+ creds, NULL);
if (ret != 0) {
PVFS_perror("PVFS_mgmt_create_dirent", ret);
}
@@ -1111,7 +1113,7 @@ int remove_directory_entry(PVFS_object_r
if (fsck_opts->destructive) {
ret = PVFS_mgmt_remove_dirent(dir_ref,
name,
- creds);
+ creds, NULL);
if (ret != 0) {
PVFS_perror("PVFS_mgmt_remove_dirent", ret);
}
@@ -1136,7 +1138,7 @@ int remove_object(PVFS_object_ref obj_re
if (fsck_opts->destructive) {
ret = PVFS_mgmt_remove_object(obj_ref,
- creds);
+ creds, NULL);
if (ret != 0) {
PVFS_perror("PVFS_mgmt_remove_object", ret);
}
Index: pvfs2-ln.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-ln.c,v
diff -p -u -r1.3.22.3 -r1.3.22.4
--- pvfs2-ln.c 18 Aug 2006 05:11:58 -0000 1.3.22.3
+++ pvfs2-ln.c 19 Aug 2006 13:09:32 -0000 1.3.22.4
@@ -187,7 +187,7 @@ static int make_link(PVFS_credentials
(char *) pszLinkTarget,
attr,
pCredentials,
- &resp_sym);
+ &resp_sym, NULL);
if (ret < 0)
{
Index: pvfs2-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-ls.c,v
diff -p -u -r1.65.4.2 -r1.65.4.3
--- pvfs2-ls.c 24 Jul 2006 17:20:14 -0000 1.65.4.2
+++ pvfs2-ls.c 19 Aug 2006 13:09:32 -0000 1.65.4.3
@@ -368,7 +368,7 @@ void print_entry(
PVFS_util_gen_credentials(&credentials);
ret = PVFS_sys_getattr(ref, PVFS_ATTR_SYS_ALL_NOHINT,
- &credentials, &getattr_response);
+ &credentials, &getattr_response, NULL);
if (ret)
{
fprintf(stderr,"Failed to get attributes on handle %llu,%d\n",
@@ -403,7 +403,7 @@ int do_list(
PVFS_util_gen_credentials(&credentials);
ret = PVFS_sys_lookup(fs_id, name, &credentials,
- &lk_response, PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ &lk_response, PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if(ret < 0)
{
PVFS_perror("PVFS_sys_lookup", ret);
@@ -416,7 +416,7 @@ int do_list(
memset(&getattr_response,0,sizeof(PVFS_sysresp_getattr));
if (PVFS_sys_getattr(ref, PVFS_ATTR_SYS_ALL_NOHINT,
- &credentials, &getattr_response) == 0)
+ &credentials, &getattr_response, NULL) == 0)
{
if ((getattr_response.attr.objtype == PVFS_TYPE_METAFILE) ||
(getattr_response.attr.objtype == PVFS_TYPE_SYMLINK) ||
@@ -434,7 +434,7 @@ int do_list(
if (getattr_response.attr.objtype == PVFS_TYPE_DIRECTORY)
{
if (PVFS_sys_getparent(ref.fs_id, name, &credentials,
- &getparent_resp) == 0)
+ &getparent_resp, NULL) == 0)
{
print_dot_and_dot_dot_info_if_required(
getparent_resp.parent_ref);
@@ -460,7 +460,7 @@ int do_list(
memset(&rd_response, 0, sizeof(PVFS_sysresp_readdir));
ret = PVFS_sys_readdir(
ref, (!token ? PVFS_READDIR_START : token),
- pvfs_dirent_incount, &credentials, &rd_response);
+ pvfs_dirent_incount, &credentials, &rd_response, NULL);
if(ret < 0)
{
PVFS_perror("PVFS_sys_readdir", ret);
Index: pvfs2-mkdir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-mkdir.c,v
diff -p -u -r1.8.18.3 -r1.8.18.4
--- pvfs2-mkdir.c 18 Aug 2006 05:11:58 -0000 1.8.18.3
+++ pvfs2-mkdir.c 19 Aug 2006 13:09:32 -0000 1.8.18.4
@@ -237,7 +237,7 @@ static int make_directory(PVFS_credentia
parentdir_ptr,
credentials,
&resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if( ret < 0 &&
!make_parent_dirs)
@@ -275,7 +275,7 @@ static int make_directory(PVFS_credentia
parentdir_ptr,
credentials,
&resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if(ret < 0)
{
@@ -314,7 +314,7 @@ static int make_directory(PVFS_credentia
parent_ref,
attr,
credentials,
- &resp_mkdir);
+ &resp_mkdir, NULL);
if (ret < 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.23.6.2 -r1.23.6.3
--- pvfs2-perf-mon-example.c 24 Jul 2006 17:20:14 -0000 1.23.6.2
+++ pvfs2-perf-mon-example.c 19 Aug 2006 13:09:32 -0000 1.23.6.3
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
next_id_array,
io_server_count,
HISTORY,
- NULL);
+ NULL, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_mgmt_perf_mon_list", ret);
Index: pvfs2-ping.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-ping.c,v
diff -p -u -r1.49.6.2 -r1.49.6.3
--- pvfs2-ping.c 24 Jul 2006 17:20:14 -0000 1.49.6.2
+++ pvfs2-ping.c 19 Aug 2006 13:09:32 -0000 1.49.6.3
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
*/
ret = PVFS_mgmt_setparam_all(
cur_fs, &creds, PVFS_SERV_PARAM_FSID_CHECK,
- (uint64_t)cur_fs, NULL, error_details);
+ (uint64_t)cur_fs, NULL, error_details, NULL);
if(ret < 0)
{
PVFS_perror("PVFS_mgmt_setparam_all", ret);
@@ -193,7 +193,7 @@ int main(int argc, char **argv)
printf("\n(7) Verifying that root handle is owned by one server...\n");
ret = PVFS_sys_lookup(cur_fs, "/", &creds,
- &resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ &resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if(ret != 0)
{
PVFS_perror("PVFS_sys_lookup", ret);
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
*/
ret = PVFS_mgmt_setparam_all(
cur_fs, &creds, PVFS_SERV_PARAM_ROOT_CHECK,
- (uint64_t)resp_lookup.ref.handle, NULL, error_details);
+ (uint64_t)resp_lookup.ref.handle, NULL, error_details, NULL);
if(ret < 0)
{
@@ -294,7 +294,7 @@ static int noop_all_servers(PVFS_fs_id f
{
printf(" %s ",
PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
- ret = PVFS_mgmt_noop(fsid, &creds, addr_array[i]);
+ ret = PVFS_mgmt_noop(fsid, &creds, addr_array[i], NULL);
if (ret == 0)
{
printf("Ok\n");
@@ -336,7 +336,7 @@ static int noop_all_servers(PVFS_fs_id f
{
printf(" %s ",
PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
- ret = PVFS_mgmt_noop(fsid, &creds, addr_array[i]);
+ ret = PVFS_mgmt_noop(fsid, &creds, addr_array[i], NULL);
if (ret == 0)
{
printf("Ok\n");
Index: pvfs2-remove-object.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-remove-object.c,v
diff -p -u -r1.7.18.2 -r1.7.18.3
--- pvfs2-remove-object.c 24 Jul 2006 17:20:14 -0000 1.7.18.2
+++ pvfs2-remove-object.c 19 Aug 2006 13:09:32 -0000 1.7.18.3
@@ -216,7 +216,7 @@ int main(int argc, char **argv)
fprintf(stderr,"Attempting to remove object %llu,%d\n",
llu(ref.handle), ref.fs_id);
- ret = PVFS_mgmt_remove_object(ref, &credentials);
+ ret = PVFS_mgmt_remove_object(ref, &credentials, NULL);
if (ret)
{
PVFS_perror("PVFS_mgmt_remove_object", ret);
@@ -228,7 +228,7 @@ int main(int argc, char **argv)
"\n", user_opts->dirent_name, llu(ref.handle), ref.fs_id);
ret = PVFS_mgmt_remove_dirent(
- ref, user_opts->dirent_name, &credentials);
+ ref, user_opts->dirent_name, &credentials, NULL);
if (ret)
{
PVFS_perror("PVFS_mgmt_remove_dirent", ret);
Index: pvfs2-rm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-rm.c,v
diff -p -u -r1.9.24.2 -r1.9.24.3
--- pvfs2-rm.c 24 Jul 2006 17:20:14 -0000 1.9.24.2
+++ pvfs2-rm.c 19 Aug 2006 13:09:32 -0000 1.9.24.3
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
rc = PVFS_sys_lookup(cur_fs, directory, &credentials,
- &resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ &resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if (rc)
{
PVFS_perror("PVFS_sys_lookup", rc);
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
}
parent_ref = resp_lookup.ref;
- rc = PVFS_sys_remove(filename, parent_ref, &credentials);
+ rc = PVFS_sys_remove(filename, parent_ref, &credentials, NULL);
if (rc)
{
fprintf(stderr, "Error: An error occurred while "
Index: pvfs2-set-debugmask.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-debugmask.c,v
diff -p -u -r1.23.6.2 -r1.23.6.3
--- pvfs2-set-debugmask.c 24 Jul 2006 17:20:14 -0000 1.23.6.2
+++ pvfs2-set-debugmask.c 19 Aug 2006 13:09:32 -0000 1.23.6.3
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
ret = PVFS_mgmt_setparam_single(
cur_fs, &creds, PVFS_SERV_PARAM_GOSSIP_MASK,
user_opts->debug_mask, user_opts->single_server,
- NULL, NULL);
+ NULL, NULL, NULL);
}
else
{
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
ret = PVFS_mgmt_setparam_all(
cur_fs, &creds, PVFS_SERV_PARAM_GOSSIP_MASK,
- user_opts->debug_mask, NULL, NULL);
+ user_opts->debug_mask, NULL, NULL, NULL);
}
if (ret)
Index: pvfs2-set-eventmask.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-eventmask.c,v
diff -p -u -r1.12.6.2 -r1.12.6.3
--- pvfs2-set-eventmask.c 24 Jul 2006 17:20:14 -0000 1.12.6.2
+++ pvfs2-set-eventmask.c 19 Aug 2006 13:09:32 -0000 1.12.6.3
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
{
/* turn off event logging */
ret = PVFS_mgmt_setparam_all(cur_fs, &creds,
- PVFS_SERV_PARAM_EVENT_ON, 0, NULL, NULL);
+ PVFS_SERV_PARAM_EVENT_ON, 0, NULL, NULL, NULL);
}
else
{
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
PVFS_SERV_PARAM_EVENT_MASKS,
(int64_t)(((int64_t)user_opts->op_mask << 32)
+ user_opts->api_mask),
- NULL, NULL);
+ NULL, NULL, NULL);
if(ret < 0)
{
PVFS_perror("PVFS_mgmt_setparam_all", ret);
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
/* turn on event logging */
ret = PVFS_mgmt_setparam_all(cur_fs, &creds,
- PVFS_SERV_PARAM_EVENT_ON, 1, NULL, NULL);
+ PVFS_SERV_PARAM_EVENT_ON, 1, NULL, NULL, NULL);
}
if(ret < 0)
Index: pvfs2-set-mode.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-mode.c,v
diff -p -u -r1.13.6.2 -r1.13.6.3
--- pvfs2-set-mode.c 24 Jul 2006 17:20:14 -0000 1.13.6.2
+++ pvfs2-set-mode.c 19 Aug 2006 13:09:32 -0000 1.13.6.3
@@ -75,6 +75,7 @@ int main(int argc, char **argv)
PVFS_SERV_PARAM_MODE,
user_opts->mode,
NULL,
+ NULL,
NULL /* detailed errors */);
PVFS_sys_finalize();
Index: pvfs2-set-sync.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-sync.c,v
diff -p -u -r1.3.10.2 -r1.3.10.3
--- pvfs2-set-sync.c 24 Jul 2006 17:20:14 -0000 1.3.10.2
+++ pvfs2-set-sync.c 19 Aug 2006 13:09:32 -0000 1.3.10.3
@@ -79,6 +79,7 @@ int main(int argc, char **argv)
&creds,
PVFS_SERV_PARAM_SYNC_META,
user_opts->meta_sync,
+ NULL,
NULL,
NULL /* detailed errors */);
if(ret < 0)
@@ -92,6 +93,7 @@ int main(int argc, char **argv)
PVFS_SERV_PARAM_SYNC_DATA,
user_opts->data_sync,
NULL,
+ NULL,
NULL /* detailed errors */);
if(ret < 0)
{
Index: pvfs2-stat.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-stat.c,v
diff -p -u -r1.6.8.3 -r1.6.8.4
--- pvfs2-stat.c 18 Aug 2006 05:11:58 -0000 1.6.8.3
+++ pvfs2-stat.c 19 Aug 2006 13:09:32 -0000 1.6.8.4
@@ -200,7 +200,7 @@ static int do_stat(const char
(char *) pszRelativeFile,
(PVFS_credentials *) credentials,
&lk_response,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
}
else
{
@@ -208,7 +208,7 @@ static int do_stat(const char
(char *) pszRelativeFile,
(PVFS_credentials *) credentials,
&lk_response,
- PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
}
if(ret < 0)
@@ -227,7 +227,7 @@ static int do_stat(const char
ret = PVFS_sys_getattr(ref,
PVFS_ATTR_SYS_ALL_NOHINT,
(PVFS_credentials *) credentials,
- &getattr_response);
+ &getattr_response, NULL);
if(ret < 0)
{
Index: pvfs2-statfs.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-statfs.c,v
diff -p -u -r1.31.6.2 -r1.31.6.3
--- pvfs2-statfs.c 24 Jul 2006 17:20:15 -0000 1.31.6.2
+++ pvfs2-statfs.c 19 Aug 2006 13:09:32 -0000 1.31.6.3
@@ -84,7 +84,7 @@ int main(int argc, char **argv)
PVFS_util_gen_credentials(&creds);
/* gather normal statfs statistics from system interface */
- ret = PVFS_sys_statfs(cur_fs, &creds, &resp_statfs);
+ ret = PVFS_sys_statfs(cur_fs, &creds, &resp_statfs, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_statfs", ret);
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
outcount = resp_statfs.server_count;
ret = PVFS_mgmt_statfs_all(cur_fs, &creds, stat_array,
- &outcount, NULL);
+ &outcount, NULL, NULL);
for(j = 0; j<2; j++)
{
Index: pvfs2-touch.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-touch.c,v
diff -p -u -r1.2.26.3 -r1.2.26.4
--- pvfs2-touch.c 18 Aug 2006 05:11:58 -0000 1.2.26.3
+++ pvfs2-touch.c 19 Aug 2006 13:09:32 -0000 1.2.26.4
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
rc = PVFS_sys_lookup(cur_fs, pvfs_path, &credentials,
- &resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ &resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW, NULL);
if (rc)
{
PVFS_perror("PVFS_sys_lookup", rc);
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
attr,
&credentials,
NULL,
- &resp_create);
+ &resp_create, NULL);
if (rc)
{
fprintf(stderr, "Error: An error occurred while creating %s\n",
Index: pvfs2-viewdist.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-viewdist.c,v
diff -p -u -r1.15.8.2 -r1.15.8.3
--- pvfs2-viewdist.c 24 Jul 2006 17:20:15 -0000 1.15.8.2
+++ pvfs2-viewdist.c 19 Aug 2006 13:09:32 -0000 1.15.8.3
@@ -114,7 +114,7 @@ static int generic_dist(file_object *obj
val.buffer = buffer;
val.buffer_sz = 4096;
if ((ret = PVFS_sys_geteattr(obj->u.pvfs2.ref,
- creds, &key, &val)) < 0)
+ creds, &key, &val, NULL)) < 0)
{
PVFS_perror("PVFS_sys_geteattr", ret);
return -1;
@@ -160,7 +160,7 @@ static int generic_server_location(file_
val.buffer = buffer;
val.buffer_sz = 4096;
if ((ret = PVFS_sys_geteattr(obj->u.pvfs2.ref,
- creds, &key, &val)) < 0)
+ creds, &key, &val, NULL)) < 0)
{
PVFS_perror("PVFS_sys_geteattr", ret);
return -1;
@@ -396,7 +396,7 @@ static int generic_open(file_object *obj
(char *) obj->u.pvfs2.pvfs2_path,
credentials,
&resp_lookup,
- PVFS2_LOOKUP_LINK_FOLLOW);
+ PVFS2_LOOKUP_LINK_FOLLOW, NULL);
if (ret < 0)
{
PVFS_perror("PVFS_sys_lookup", ret);
@@ -407,7 +407,7 @@ static int generic_open(file_object *obj
memset(&resp_getattr, 0, sizeof(PVFS_sysresp_getattr));
ret = PVFS_sys_getattr(ref, PVFS_ATTR_SYS_ALL_NOHINT,
- credentials, &resp_getattr);
+ credentials, &resp_getattr, NULL);
if (ret)
{
fprintf(stderr, "Failed to do pvfs2 getattr on %s\n",
More information about the Pvfs2-cvs
mailing list