[PVFS2-CVS]
commit by pcarns in pvfs2/test/correctness/pts: create.c
pvfs-helper.c pvfs-helper.h test-concurrent-meta.c
test-dir-operations.c test-dir-torture.c test-finalized.c
test-invalid-files.c test-lookup-bench.c test-misc.c
test-null-params.c test-path-lookup.c test-pvfs-datatype-contig.c
test-pvfs-datatype-hvector.c test-pvfs-datatype-init.c
test-pvfs-datatype-vector.c test-uninitialized.c
CVS commit program
cvs at parl.clemson.edu
Wed Mar 24 18:10:34 EST 2004
Update of /projects/cvsroot/pvfs2/test/correctness/pts
In directory parlweb:/tmp/cvs-serv12024/test/correctness/pts
Modified Files:
create.c pvfs-helper.c pvfs-helper.h test-concurrent-meta.c
test-dir-operations.c test-dir-torture.c test-finalized.c
test-invalid-files.c test-lookup-bench.c test-misc.c
test-null-params.c test-path-lookup.c
test-pvfs-datatype-contig.c test-pvfs-datatype-hvector.c
test-pvfs-datatype-init.c test-pvfs-datatype-vector.c
test-uninitialized.c
Log Message:
rename PVFS_pinode_reference -> PVFS_object_ref in system interface, a few
related variable name updates
Index: create.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/create.c,v
diff -p -u -r1.29 -r1.30
--- create.c 19 Mar 2004 18:54:03 -0000 1.29
+++ create.c 24 Mar 2004 23:10:34 -0000 1.30
@@ -45,7 +45,7 @@ static int create_file(PVFS_fs_id fs_id,
attr.atime = attr.mtime = attr.ctime = 0xdeadbeef;
memset(&resp_create,0,sizeof(resp_create));
- ret = PVFS_sys_create(filename, resp_look.pinode_refn,
+ ret = PVFS_sys_create(filename, resp_look.ref,
attr, credentials, &resp_create);
if (ret < 0)
{
@@ -53,7 +53,7 @@ static int create_file(PVFS_fs_id fs_id,
return (-1);
}
- ret = PVFS_sys_getattr(resp_create.pinode_refn, attr.mask,
+ ret = PVFS_sys_getattr(resp_create.ref, attr.mask,
credentials, &resp_getattr);
if (ret < 0)
{
Index: pvfs-helper.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/pvfs-helper.c,v
diff -p -u -r1.31 -r1.32
--- pvfs-helper.c 19 Mar 2004 18:54:03 -0000 1.31
+++ pvfs-helper.c 24 Mar 2004 23:10:34 -0000 1.32
@@ -46,7 +46,7 @@ int finalize_sysint(void)
* returns: 0 on success;
* -1 if a problem
*/
-int get_root(PVFS_fs_id fs_id, PVFS_pinode_reference *pinode_refn)
+int get_root(PVFS_fs_id fs_id, PVFS_object_ref *pinode_refn)
{
int ret = -1;
PVFS_credentials credentials;
@@ -66,14 +66,14 @@ int get_root(PVFS_fs_id fs_id, PVFS_pino
{
printf("Lookup failed with errcode = %d\n", ret);
}
- memcpy(pinode_refn, &resp_look.pinode_refn,
- sizeof(PVFS_pinode_reference));
+ memcpy(pinode_refn, &resp_look.ref,
+ sizeof(PVFS_object_ref));
}
return ret;
}
-int create_dir(PVFS_pinode_reference parent_refn, char *name,
- PVFS_pinode_reference *out_refn)
+int create_dir(PVFS_object_ref parent_refn, char *name,
+ PVFS_object_ref *out_refn)
{
int ret = -1;
PVFS_sys_attr attr;
@@ -100,9 +100,9 @@ int create_dir(PVFS_pinode_reference par
}
if (out_refn)
{
- memset(out_refn, 0, sizeof(PVFS_pinode_reference));
- memcpy(out_refn, &resp_mkdir.pinode_refn,
- sizeof(PVFS_pinode_reference));
+ memset(out_refn, 0, sizeof(PVFS_object_ref));
+ memcpy(out_refn, &resp_mkdir.ref,
+ sizeof(PVFS_object_ref));
}
return 0;
}
@@ -113,7 +113,7 @@ int create_dir(PVFS_pinode_reference par
* returns 0 on success.
* -1 if some error happened.
*/
-int remove_file(PVFS_pinode_reference parent_refn, char *name)
+int remove_file(PVFS_object_ref parent_refn, char *name)
{
int ret = -1;
PVFS_credentials credentials;
@@ -135,7 +135,7 @@ int remove_file(PVFS_pinode_reference pa
* returns 0 on success.
* -1 if some error happened.
*/
-int remove_dir(PVFS_pinode_reference parent_refn, char *name)
+int remove_dir(PVFS_object_ref parent_refn, char *name)
{
return remove_file(parent_refn, name);
}
@@ -146,8 +146,8 @@ int remove_dir(PVFS_pinode_reference par
* returns a handle to the new directory
* -1 if some error happened
*/
-int lookup_name(PVFS_pinode_reference pinode_refn, char *name,
- PVFS_pinode_reference *out_refn)
+int lookup_name(PVFS_object_ref pinode_refn, char *name,
+ PVFS_object_ref *out_refn)
{
int ret = -1;
PVFS_credentials credentials;
@@ -167,8 +167,8 @@ int lookup_name(PVFS_pinode_reference pi
}
if (out_refn)
{
- memcpy(out_refn, &resp_lookup.pinode_refn,
- sizeof(PVFS_pinode_reference));
+ memcpy(out_refn, &resp_lookup.ref,
+ sizeof(PVFS_object_ref));
}
return 0;
}
Index: pvfs-helper.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/pvfs-helper.h,v
diff -p -u -r1.15 -r1.16
--- pvfs-helper.h 19 Mar 2004 18:54:03 -0000 1.15
+++ pvfs-helper.h 24 Mar 2004 23:10:34 -0000 1.16
@@ -31,17 +31,17 @@ extern pvfs_helper_t pvfs_helper;
these are some helper functions that are implemented in pvfs-helper.c
they return 0 on success; non-zero otherwise unless specified
*/
-int create_dir(PVFS_pinode_reference parent_refn, char *name,
- PVFS_pinode_reference *out_refn);
+int create_dir(PVFS_object_ref parent_refn, char *name,
+ PVFS_object_ref *out_refn);
-int remove_file(PVFS_pinode_reference parent_refn, char *name);
+int remove_file(PVFS_object_ref parent_refn, char *name);
-int remove_dir(PVFS_pinode_reference parent_refn, char *name);
+int remove_dir(PVFS_object_ref parent_refn, char *name);
-int lookup_name(PVFS_pinode_reference pinode_refn, char *name,
- PVFS_pinode_reference *out_refn);
+int lookup_name(PVFS_object_ref pinode_refn, char *name,
+ PVFS_object_ref *out_refn);
-int get_root(PVFS_fs_id fs_id, PVFS_pinode_reference *pinode_refn);
+int get_root(PVFS_fs_id fs_id, PVFS_object_ref *pinode_refn);
int initialize_sysint(void);
int finalize_sysint(void);
Index: test-concurrent-meta.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-concurrent-meta.c,v
diff -p -u -r1.13 -r1.14
--- test-concurrent-meta.c 19 Mar 2004 18:54:03 -0000 1.13
+++ test-concurrent-meta.c 24 Mar 2004 23:10:34 -0000 1.14
@@ -60,7 +60,7 @@ static int getattr(char *name, int fs_id
{
int ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_sysresp_getattr resp_getattr;
uint32_t attrmask;
PVFS_sysresp_lookup resp_lookup;
@@ -76,7 +76,7 @@ static int getattr(char *name, int fs_id
return ret;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attrmask = PVFS_ATTR_SYS_ALL_NOSIZE;
ret = PVFS_sys_getattr(pinode_refn, attrmask, credentials, &resp_getattr);
@@ -109,7 +109,7 @@ static int remove_file_dir(char *name, i
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- ret = PVFS_sys_remove(name, resp_look.pinode_refn, credentials);
+ ret = PVFS_sys_remove(name, resp_look.ref, credentials);
return ret;
}
@@ -126,7 +126,7 @@ static int list_dir(char *test_dir, int
{
int ret;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_ds_position token;
PVFS_sysresp_readdir resp_readdir;
int pvfs_dirent_incount;
@@ -145,7 +145,7 @@ static int list_dir(char *test_dir, int
return -1;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
token = PVFS_READDIR_START;
pvfs_dirent_incount = 1;
@@ -190,7 +190,7 @@ static int create_file(char *filename, c
return (-1);
}
- ret = PVFS_sys_create(filename, resp_look.pinode_refn,
+ ret = PVFS_sys_create(filename, resp_look.ref,
attr, credentials, &resp_create);
return ret;
}
@@ -205,7 +205,7 @@ static int create_file(char *filename, c
*/
static int create_dir2(char *name, int fs_id)
{
- PVFS_pinode_reference parent_refn;
+ PVFS_object_ref parent_refn;
PVFS_sys_attr attr;
PVFS_sysresp_mkdir resp_mkdir;
@@ -222,7 +222,7 @@ static int create_dir2(char *name, int f
return -1;
}
- parent_refn = resp_lookup.pinode_refn;
+ parent_refn = resp_lookup.ref;
attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
attr.owner = credentials.uid;
attr.group = credentials.gid;
Index: test-dir-operations.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-dir-operations.c,v
diff -p -u -r1.15 -r1.16
--- test-dir-operations.c 19 Mar 2004 18:54:03 -0000 1.15
+++ test-dir-operations.c 24 Mar 2004 23:10:34 -0000 1.16
@@ -20,7 +20,7 @@
* rank: rank in the mpi process group
*/
-static int remove_dirs(PVFS_pinode_reference parent_refn,
+static int remove_dirs(PVFS_object_ref parent_refn,
int ndirs,
int rank)
{
@@ -39,7 +39,7 @@ static int remove_dirs(PVFS_pinode_refer
return 0;
}
-static int read_dirs(PVFS_pinode_reference refn,
+static int read_dirs(PVFS_object_ref refn,
int ndirs,
int rank)
{
@@ -98,13 +98,13 @@ static int read_dirs(PVFS_pinode_referen
return 0;
}
-static int create_dirs(PVFS_pinode_reference refn,
+static int create_dirs(PVFS_object_ref refn,
int ndirs,
int rank)
{
int i;
char name[PVFS_SEGMENT_MAX];
- PVFS_pinode_reference out_refn;
+ PVFS_object_ref out_refn;
for (i = 0; i < ndirs; i++)
{
@@ -137,7 +137,7 @@ int test_dir_operations(MPI_Comm * comm,
int nerrs = 0;
char name[PVFS_SEGMENT_MAX];
PVFS_fs_id fs_id = 0;
- PVFS_pinode_reference root_refn, out_refn;
+ PVFS_object_ref root_refn, out_refn;
generic_params *myparams = (generic_params *) rawparams;
if (rank == 0)
Index: test-dir-torture.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-dir-torture.c,v
diff -p -u -r1.10 -r1.11
--- test-dir-torture.c 18 Mar 2004 20:59:02 -0000 1.10
+++ test-dir-torture.c 24 Mar 2004 23:10:34 -0000 1.11
@@ -29,8 +29,8 @@ static int recursive_create_dir(PVFS_han
{
int i;
char name[PVFS_SEGMENT_MAX];
- PVFS_pinode_reference refn;
- PVFS_pinode_reference out_refn;
+ PVFS_object_ref refn;
+ PVFS_object_ref out_refn;
/* base case: we've gone far enough */
if (depth == 0)
@@ -80,7 +80,7 @@ int test_dir_torture(MPI_Comm * comm __u
void *rawparams)
{
PVFS_fs_id fs_id;
- PVFS_pinode_reference root_refn;
+ PVFS_object_ref root_refn;
generic_params *myparams = (generic_params *) rawparams;
int nerrs = 0;
Index: test-finalized.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-finalized.c,v
diff -p -u -r1.16 -r1.17
--- test-finalized.c 19 Mar 2004 18:54:03 -0000 1.16
+++ test-finalized.c 24 Mar 2004 23:10:34 -0000 1.17
@@ -62,7 +62,7 @@ static int test_getattr(void)
{
int fs_id, ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
uint32_t attrmask;
PVFS_sysresp_lookup resp_lookup;
PVFS_sysresp_getattr resp_getattr;
@@ -90,7 +90,7 @@ static int test_getattr(void)
return ret;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attrmask = PVFS_ATTR_SYS_ALL_NOSIZE;
ret = PVFS_sys_getattr(pinode_refn, attrmask, credentials, &resp_getattr);
@@ -113,7 +113,7 @@ static int test_setattr(void)
*/
static int test_mkdir(void)
{
- PVFS_pinode_reference parent_refn;
+ PVFS_object_ref parent_refn;
PVFS_sys_attr attr;
PVFS_sysresp_mkdir resp_mkdir;
@@ -143,7 +143,7 @@ static int test_mkdir(void)
return -1;
}
- parent_refn = resp_lookup.pinode_refn;
+ parent_refn = resp_lookup.ref;
attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
attr.owner = credentials.uid;
attr.group = credentials.gid;
@@ -165,7 +165,7 @@ static int test_readdir(void)
int ret;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_ds_position token;
int pvfs_dirent_incount;
PVFS_credentials credentials;
@@ -196,7 +196,7 @@ static int test_readdir(void)
return -1;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
token = PVFS_READDIR_START;
pvfs_dirent_incount = 1;
@@ -260,7 +260,7 @@ static int test_create(void)
}
ret =
- PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
return ret;
}
@@ -298,7 +298,7 @@ static int test_remove(void)
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- ret = PVFS_sys_remove(filename, resp_look.pinode_refn, credentials);
+ ret = PVFS_sys_remove(filename, resp_look.ref, credentials);
return ret;
}
@@ -374,7 +374,7 @@ static int test_read(void)
}
ret =
- PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer, req_mem, credentials,
+ PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer, req_mem, credentials,
&resp_io);
return ret;
}
@@ -422,7 +422,7 @@ static int test_write(void)
}
ret =
- PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer, req_mem, credentials,
+ PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer, req_mem, credentials,
&resp_io);
return ret;
}
Index: test-invalid-files.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-invalid-files.c,v
diff -p -u -r1.17 -r1.18
--- test-invalid-files.c 19 Mar 2004 18:54:03 -0000 1.17
+++ test-invalid-files.c 24 Mar 2004 23:10:34 -0000 1.18
@@ -62,7 +62,7 @@ static int test_getattr(int testcase)
{
int fs_id, ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
uint32_t attrmask;
PVFS_sysresp_lookup resp_lookup;
PVFS_sysresp_getattr resp_getattr;
@@ -89,7 +89,7 @@ static int test_getattr(int testcase)
return ret;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attrmask = PVFS_ATTR_SYS_ALL_NOSIZE;
switch (testcase)
@@ -126,7 +126,7 @@ static int test_setattr(void)
*/
static int test_mkdir(int testcase)
{
- PVFS_pinode_reference parent_refn;
+ PVFS_object_ref parent_refn;
PVFS_sys_attr attr;
PVFS_sysresp_mkdir resp_mkdir;
@@ -155,7 +155,7 @@ static int test_mkdir(int testcase)
return -1;
}
- parent_refn = resp_lookup.pinode_refn;
+ parent_refn = resp_lookup.ref;
attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
attr.owner = credentials.uid;
attr.group = credentials.gid;
@@ -189,7 +189,7 @@ static int test_readdir(int testcase)
int ret;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_ds_position token;
int pvfs_dirent_incount;
PVFS_credentials credentials;
@@ -219,7 +219,7 @@ static int test_readdir(int testcase)
return -1;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
token = PVFS_READDIR_START;
pvfs_dirent_incount = 1;
@@ -286,15 +286,15 @@ static int test_create(int testcase)
switch (testcase)
{
case 0:
- resp_look.pinode_refn.handle = -1;
+ resp_look.ref.handle = -1;
ret =
- PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
break;
case 1:
- resp_look.pinode_refn.fs_id = -1;
+ resp_look.ref.fs_id = -1;
ret =
- PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
break;
default:
@@ -340,12 +340,12 @@ static int test_remove(int testcase)
switch (testcase)
{
case 0:
- resp_look.pinode_refn.handle = -1;
- ret = PVFS_sys_remove(filename, resp_look.pinode_refn, credentials);
+ resp_look.ref.handle = -1;
+ ret = PVFS_sys_remove(filename, resp_look.ref, credentials);
break;
case 1:
- resp_look.pinode_refn.fs_id = -1;
- ret = PVFS_sys_remove(filename, resp_look.pinode_refn, credentials);
+ resp_look.ref.fs_id = -1;
+ ret = PVFS_sys_remove(filename, resp_look.ref, credentials);
break;
default:
fprintf(stderr, "Error: invalid case number \n");
@@ -426,15 +426,15 @@ static int test_read(int testcase)
switch (testcase)
{
case 0:
- resp_lk.pinode_refn.handle = -1;
+ resp_lk.ref.handle = -1;
ret =
- PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer, req_mem,
+ PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer, req_mem,
credentials, &resp_io);
break;
case 1:
- resp_lk.pinode_refn.fs_id = -1;
+ resp_lk.ref.fs_id = -1;
ret =
- PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer, req_mem,
+ PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer, req_mem,
credentials, &resp_io);
break;
}
@@ -485,15 +485,15 @@ static int test_write(int testcase)
switch (testcase)
{
case 0:
- resp_lk.pinode_refn.handle = -1;
+ resp_lk.ref.handle = -1;
ret =
- PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer, req_mem,
+ PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer, req_mem,
credentials, &resp_io);
break;
case 1:
- resp_lk.pinode_refn.fs_id = -1;
+ resp_lk.ref.fs_id = -1;
ret =
- PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer, req_mem,
+ PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer, req_mem,
credentials, &resp_io);
break;
}
@@ -536,7 +536,7 @@ static int init_file(void)
return (-1);
}
- return PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ return PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
}
Index: test-lookup-bench.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-lookup-bench.c,v
diff -p -u -r1.15 -r1.16
--- test-lookup-bench.c 19 Mar 2004 18:54:03 -0000 1.15
+++ test-lookup-bench.c 24 Mar 2004 23:10:34 -0000 1.16
@@ -40,10 +40,10 @@ static PVFS_handle simple_lookup_name(ch
return(-1);
}
- return (PVFS_handle) resp_lookup.pinode_refn.handle;
+ return (PVFS_handle) resp_lookup.ref.handle;
}
-static int do_create_lookup(PVFS_pinode_reference parent_refn,
+static int do_create_lookup(PVFS_object_ref parent_refn,
PVFS_fs_id fs_id,
int depth,
int ndirs,
@@ -53,7 +53,7 @@ static int do_create_lookup(PVFS_pinode_
char name[PVFS_NAME_MAX];
char path[PVFS_NAME_MAX]; /*same as name except it has a slash prepending the path*/
PVFS_handle dir_handle, lookup_handle;
- PVFS_pinode_reference out_refn;
+ PVFS_object_ref out_refn;
double before, after, running_total = 0, max=0.0, min = 10000.0, total = 0, current;
/* base case: we've gone far enough */
@@ -118,7 +118,7 @@ int test_lookup_bench(MPI_Comm * comm __
{
int ret = -1;
PVFS_fs_id fs_id;
- PVFS_pinode_reference root_refn;
+ PVFS_object_ref root_refn;
generic_params *myparams = (generic_params *) rawparams;
int nerrs = 0;
Index: test-misc.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-misc.c,v
diff -p -u -r1.18 -r1.19
--- test-misc.c 19 Mar 2004 18:54:03 -0000 1.18
+++ test-misc.c 24 Mar 2004 23:10:34 -0000 1.19
@@ -27,7 +27,7 @@
static int test_meta_fields(int testcase){
int fs_id, ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_sysresp_lookup resp_lookup;
PVFS_sys_attr attr;
char *name;
@@ -52,7 +52,7 @@ static int test_meta_fields(int testcase
return ret;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attr.mask = PVFS_ATTR_SYS_ALL_NOSIZE;
attr.owner = credentials.uid;
attr.group = credentials.gid;
@@ -150,7 +150,7 @@ static int test_permissions(int testcase
}
break;
}
- ret = PVFS_sys_read(resp_lk.pinode_refn, req_io, file_req_offset,io_buffer, req_mem,
+ ret = PVFS_sys_read(resp_lk.ref, req_io, file_req_offset,io_buffer, req_mem,
credentials, &resp_io);
finalize_sysint();
return ret;
@@ -196,7 +196,7 @@ static int test_size_after_write(void){
debug_printf("test_pvfs_datatype_hvector: lookup failed "
"on %s\n", filename);
}
- if((ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp)) < 0)
return ret;
oldsize = resp.attr.size;
@@ -206,13 +206,13 @@ static int test_size_after_write(void){
io_buffer[i] = 'a';
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, file_req_offset, io_buffer, req_mem,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, file_req_offset, io_buffer, req_mem,
credentials, &resp_io);
if(ret < 0){
debug_printf("write failed on %s\n", filename);
}
- ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp);
+ ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp);
if (ret < 0)
{
debug_printf("getattr failed on %s\n", filename);
@@ -264,7 +264,7 @@ static int test_sparse_files(void){
debug_printf("test_pvfs_datatype_hvector: lookup failed "
"on %s\n", filename);
}
- if((ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp)) < 0)
return ret;
oldsize = resp.attr.size;
@@ -291,13 +291,13 @@ static int test_sparse_files(void){
io_buffer[i] = 'a';
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, file_req_offset, io_buffer, req_mem,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, file_req_offset, io_buffer, req_mem,
credentials, &resp_io);
if(ret < 0){
debug_printf("write failed on %s\n", filename);
}
- ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp);
+ ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp);
if (ret < 0)
{
debug_printf("getattr failed on %s\n", filename);
@@ -348,7 +348,7 @@ static int test_read_sparse_files(void){
debug_printf("test_pvfs_datatype_hvector: lookup failed "
"on %s\n", filename);
}
- if((ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp)) < 0)
return ret;
assert(0);
@@ -372,12 +372,12 @@ static int test_read_sparse_files(void){
{
io_buffer[i] = 'a';
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, file_req_offset, io_buffer, req_mem,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, file_req_offset, io_buffer, req_mem,
credentials, &resp_io);
if(ret < 0){
debug_printf("write failed on %s\n", filename);
}
- ret = PVFS_sys_read(resp_lk.pinode_refn, req_io, file_req_offset, io_buffer, req_mem,
+ ret = PVFS_sys_read(resp_lk.ref, req_io, file_req_offset, io_buffer, req_mem,
credentials, &resp_io);
if(ret < 0){
debug_printf("write failed on %s\n", filename);
@@ -427,7 +427,7 @@ static int test_allcat(int testcase)
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- if((ret = PVFS_sys_getattr(resp_look.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_look.ref, attrmask, credentials, &resp)) < 0)
return ret;
oldsize = resp.attr.size;
@@ -435,15 +435,15 @@ static int test_allcat(int testcase)
{
case 0:
size = 5;
- //ret = PVFS_sys_allocate(resp_look.pinode_refn, size );
+ //ret = PVFS_sys_allocate(resp_look.ref, size );
break;
case 1:
size = 100000;
- //ret = PVFS_sys_allocate(resp_look.pinode_refn, size );
+ //ret = PVFS_sys_allocate(resp_look.ref, size );
break;
case 2:
size = 1000000;
- //ret = PVFS_sys_allocate(resp_look.pinode_refn, size );
+ //ret = PVFS_sys_allocate(resp_look.ref, size );
break;
}
//get file
@@ -454,7 +454,7 @@ static int test_allcat(int testcase)
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- ret = PVFS_sys_getattr(resp_look.pinode_refn, attrmask, credentials, &resp);
+ ret = PVFS_sys_getattr(resp_look.ref, attrmask, credentials, &resp);
if (ret < 0)
{
debug_printf("getattr failed on %s\n", filename);
@@ -497,7 +497,7 @@ static int test_truncat(int testcase)
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- if((ret = PVFS_sys_getattr(resp_look.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_look.ref, attrmask, credentials, &resp)) < 0)
return ret;
oldsize = resp.attr.size;
@@ -506,15 +506,15 @@ static int test_truncat(int testcase)
{
case 0:
size = 1000000;
- ret = PVFS_sys_truncate(resp_look.pinode_refn, size, credentials);
+ ret = PVFS_sys_truncate(resp_look.ref, size, credentials);
break;
case 1:
size = 100000;
- ret = PVFS_sys_truncate(resp_look.pinode_refn, size, credentials);
+ ret = PVFS_sys_truncate(resp_look.ref, size, credentials);
break;
case 2:
size = 5;
- ret = PVFS_sys_truncate(resp_look.pinode_refn, size, credentials);
+ ret = PVFS_sys_truncate(resp_look.ref, size, credentials);
break;
}
@@ -526,7 +526,7 @@ static int test_truncat(int testcase)
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- if((ret = PVFS_sys_getattr(resp_look.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_look.ref, attrmask, credentials, &resp)) < 0)
return ret;
if(resp.attr.size != (oldsize - size))
@@ -576,11 +576,11 @@ static int test_read_beyond(void){
debug_printf("test_pvfs_datatype_hvector: lookup failed "
"on %s\n", filename);
}
- if((ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp)) < 0)
return ret;
io_buffer = malloc(sizeof(char)*(size_t)resp.attr.size+100);
- ret = PVFS_sys_read(resp_lk.pinode_refn, req_io, file_req_offset, io_buffer, req_mem, credentials, &resp_io);
+ ret = PVFS_sys_read(resp_lk.ref, req_io, file_req_offset, io_buffer, req_mem, credentials, &resp_io);
if(ret < 0){
debug_printf("write failed on %s\n", filename);
}
@@ -630,7 +630,7 @@ static int test_write_beyond(void){
debug_printf("test_pvfs_datatype_hvector: lookup failed "
"on %s\n", filename);
}
- if((ret = PVFS_sys_getattr(resp_lk.pinode_refn, attrmask, credentials, &resp)) < 0)
+ if((ret = PVFS_sys_getattr(resp_lk.ref, attrmask, credentials, &resp)) < 0)
return ret;
io_buffer = malloc(sizeof(char)*(size_t)resp.attr.size+100);
@@ -640,7 +640,7 @@ static int test_write_beyond(void){
{
io_buffer[i] = 'a';
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, file_req_offset, io_buffer, req_mem,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, file_req_offset, io_buffer, req_mem,
credentials, &resp_io);
if(ret < 0){
debug_printf("write failed on %s\n", filename);
@@ -689,7 +689,7 @@ static int test_files_as_dirs(int testca
return (-1);
}
- ret = PVFS_sys_create("foo", resp_look.pinode_refn, attr, credentials,
+ ret = PVFS_sys_create("foo", resp_look.ref, attr, credentials,
&resp_create);
//get root
ret = PVFS_sys_lookup(fs_id, "/foo", credentials,
@@ -700,7 +700,7 @@ static int test_files_as_dirs(int testca
return (-1);
}
- ret = PVFS_sys_create("bar", resp_look.pinode_refn, attr, credentials,
+ ret = PVFS_sys_create("bar", resp_look.ref, attr, credentials,
&resp_create);
break;
case 1:
@@ -715,7 +715,7 @@ static int test_get_set_attr_empty(int t
{
int fs_id, ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_sysresp_lookup resp_lookup;
PVFS_sys_attr attr;
PVFS_sysresp_getattr resp;
@@ -743,7 +743,7 @@ static int test_get_set_attr_empty(int t
/* return ret; */
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attr.mask = PVFS_ATTR_SYS_ALL_NOSIZE;
attr.owner = credentials.uid;
attr.group = credentials.gid;
@@ -828,14 +828,14 @@ static int test_io_on_dir(int testcase)
switch(testcase)
{
case 0:
- ret = PVFS_sys_read(resp_lookup.pinode_refn, req_io, file_req_offset, io_buffer, req_mem, credentials, &resp_io);
+ ret = PVFS_sys_read(resp_lookup.ref, req_io, file_req_offset, io_buffer, req_mem, credentials, &resp_io);
break;
case 1:
for(i = 0; i < 100; i++)
{
io_buffer[i] = 'a';
}
- ret = PVFS_sys_write(resp_lookup.pinode_refn, req_io, file_req_offset, io_buffer, req_mem, credentials, &resp_io);
+ ret = PVFS_sys_write(resp_lookup.ref, req_io, file_req_offset, io_buffer, req_mem, credentials, &resp_io);
break;
}
@@ -875,7 +875,7 @@ static int test_remove_nonempty_dir(int
switch (testcase)
{
case 0:
- ret = PVFS_sys_remove(NULL, resp_look.pinode_refn, credentials);
+ ret = PVFS_sys_remove(NULL, resp_look.ref, credentials);
break;
default:
fprintf(stderr, "Error: invalid case number \n");
@@ -919,19 +919,19 @@ static int init_files(void)
return (-1);
}
- ret = PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ ret = PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
/* create sparse file */
filename = strcpy(filename, "sparse");
- ret = PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ ret = PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
/* create a file for testing alocate and truncate*/
filename = strcpy(filename, "altrun");
- ret = PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ ret = PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
@@ -956,7 +956,7 @@ static int init_files(void)
return (-1);
}
- return PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ return PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
}
Index: test-null-params.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-null-params.c,v
diff -p -u -r1.35 -r1.36
--- test-null-params.c 19 Mar 2004 18:54:03 -0000 1.35
+++ test-null-params.c 24 Mar 2004 23:10:34 -0000 1.36
@@ -106,7 +106,7 @@ static int test_getattr(int nullCase)
{
int fs_id, ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
uint32_t attrmask;
PVFS_sysresp_lookup resp_lookup;
char *name;
@@ -132,7 +132,7 @@ static int test_getattr(int nullCase)
return ret;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attrmask = PVFS_ATTR_SYS_ALL_NOSIZE;
switch (nullCase)
@@ -160,7 +160,7 @@ static int test_setattr(void)
*/
static int test_mkdir(int nullCase)
{
- PVFS_pinode_reference parent_refn;
+ PVFS_object_ref parent_refn;
PVFS_sys_attr attr;
PVFS_sysresp_mkdir resp_mkdir;
@@ -189,7 +189,7 @@ static int test_mkdir(int nullCase)
return -1;
}
- parent_refn = resp_lookup.pinode_refn;
+ parent_refn = resp_lookup.ref;
attr.owner = credentials.uid;
attr.group = credentials.gid;
attr.perms = 1877;
@@ -220,7 +220,7 @@ static int test_readdir(int nullCase)
int ret;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_ds_position token;
int pvfs_dirent_incount;
PVFS_credentials credentials;
@@ -249,7 +249,7 @@ static int test_readdir(int nullCase)
return -1;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
token = PVFS_READDIR_START;
pvfs_dirent_incount = 1;
@@ -307,12 +307,12 @@ static int test_create(int nullCase)
{
case 0:
ret =
- PVFS_sys_create(NULL, resp_look.pinode_refn, attr, credentials,
+ PVFS_sys_create(NULL, resp_look.ref, attr, credentials,
&resp_create);
break;
case 1:
ret =
- PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ PVFS_sys_create(filename, resp_look.ref, attr, credentials,
NULL);
break;
default:
@@ -358,7 +358,7 @@ static int test_remove(int nullCase)
switch (nullCase)
{
case 0:
- ret = PVFS_sys_remove(NULL, resp_look.pinode_refn, credentials);
+ ret = PVFS_sys_remove(NULL, resp_look.ref, credentials);
break;
default:
fprintf(stderr, "Error: invalid case number \n");
@@ -438,17 +438,17 @@ static int test_read(int nullCase)
{
case 0:
ret =
- PVFS_sys_read(resp_lk.pinode_refn, NULL, 0, io_buffer, NULL,
+ PVFS_sys_read(resp_lk.ref, NULL, 0, io_buffer, NULL,
credentials, &resp_io);
break;
case 1:
ret =
- PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, NULL, NULL, credentials,
+ PVFS_sys_read(resp_lk.ref, req_io, 0, NULL, NULL, credentials,
&resp_io);
break;
case 2:
ret =
- PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer, NULL,
+ PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer, NULL,
credentials, NULL);
break;
}
@@ -498,17 +498,17 @@ static int test_write(int nullCase)
{
case 0:
ret =
- PVFS_sys_write(resp_lk.pinode_refn, NULL, 0, io_buffer, NULL,
+ PVFS_sys_write(resp_lk.ref, NULL, 0, io_buffer, NULL,
credentials, &resp_io);
break;
case 1:
ret =
- PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, NULL, NULL, credentials,
+ PVFS_sys_write(resp_lk.ref, req_io, 0, NULL, NULL, credentials,
&resp_io);
break;
case 2:
ret =
- PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer, NULL,
+ PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer, NULL,
credentials, NULL);
break;
}
@@ -549,7 +549,7 @@ static int init_file(void)
return (-1);
}
- return PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ return PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
}
Index: test-path-lookup.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-path-lookup.c,v
diff -p -u -r1.7 -r1.8
--- test-path-lookup.c 19 Mar 2004 18:54:03 -0000 1.7
+++ test-path-lookup.c 24 Mar 2004 23:10:34 -0000 1.8
@@ -34,11 +34,11 @@ static int build_nested_path(int levels,
PVFS_sysresp_mkdir mkdir_resp;
PVFS_sysresp_symlink symlink_resp;
char PATH_LOOKUP_BASE_DIR[64] = {0};
- PVFS_pinode_reference root_refn, parent_refn, base_refn;
- PVFS_pinode_reference *newdir_refns = NULL;
- PVFS_pinode_reference *lookup_refns = NULL;
- PVFS_pinode_reference *rsymlink_refns = NULL;
- PVFS_pinode_reference *asymlink_refns = NULL;
+ PVFS_object_ref root_refn, parent_refn, base_refn;
+ PVFS_object_ref *newdir_refns = NULL;
+ PVFS_object_ref *lookup_refns = NULL;
+ PVFS_object_ref *rsymlink_refns = NULL;
+ PVFS_object_ref *asymlink_refns = NULL;
char **absolute_paths = NULL;
if (levels && format)
@@ -59,7 +59,7 @@ static int build_nested_path(int levels,
return ret;
}
- root_refn = lookup_resp.pinode_refn;
+ root_refn = lookup_resp.ref;
fprintf(stderr,"Got Root Handle %Lu on fs %d\n",
Lu(root_refn.handle), root_refn.fs_id);
@@ -81,12 +81,12 @@ static int build_nested_path(int levels,
"base directory %s\n", PATH_LOOKUP_BASE_DIR);
goto cleanup;
}
- base_refn = mkdir_resp.pinode_refn;
+ base_refn = mkdir_resp.ref;
- newdir_refns = (PVFS_pinode_reference *)malloc(
- (levels * sizeof(PVFS_pinode_reference)));
- lookup_refns = (PVFS_pinode_reference *)malloc(
- (levels * sizeof(PVFS_pinode_reference)));
+ newdir_refns = (PVFS_object_ref *)malloc(
+ (levels * sizeof(PVFS_object_ref)));
+ lookup_refns = (PVFS_object_ref *)malloc(
+ (levels * sizeof(PVFS_object_ref)));
absolute_paths = (char **)malloc(
(levels * PVFS_NAME_MAX * sizeof(char)));
if (!newdir_refns || !lookup_refns | !absolute_paths)
@@ -97,7 +97,7 @@ static int build_nested_path(int levels,
for(i = 0; i < levels; i++)
{
- parent_refn = mkdir_resp.pinode_refn;
+ parent_refn = mkdir_resp.ref;
GENERATE_FILENAME(cur_filename, 64, format, i, rank, 0);
fprintf(stderr," Creating directory %s under %Lu, %d\n",
@@ -114,7 +114,7 @@ static int build_nested_path(int levels,
}
/* grab refn of newly created directory */
- newdir_refns[i] = mkdir_resp.pinode_refn;
+ newdir_refns[i] = mkdir_resp.ref;
}
/* generate the absolute path names */
@@ -161,7 +161,7 @@ static int build_nested_path(int levels,
}
/* grab refn of looked up directory */
- lookup_refns[i] = lookup_resp.pinode_refn;
+ lookup_refns[i] = lookup_resp.ref;
/* then do an absolute path lookup */
fprintf(stderr,"Looking up path %d [ABSOLUTE] \t\t... ", i);
@@ -187,16 +187,16 @@ static int build_nested_path(int levels,
lookup yielded the same result
*/
if ((lookup_refns[i].fs_id !=
- lookup_resp.pinode_refn.fs_id) ||
+ lookup_resp.ref.fs_id) ||
(lookup_refns[i].handle !=
- lookup_resp.pinode_refn.handle))
+ lookup_resp.ref.handle))
{
fprintf(stderr," PVFS_sys_ref_lookup and "
"PVFS_sys_lookup returned different results "
"when they should be the same!\n");
goto cleanup;
}
- parent_refn = lookup_resp.pinode_refn;
+ parent_refn = lookup_resp.ref;
}
ret = 0;
}
@@ -210,10 +210,10 @@ static int build_nested_path(int levels,
generate both relative and absolute symlinks for
most of the nested directories created
*/
- rsymlink_refns = (PVFS_pinode_reference *)malloc(
- (levels * sizeof(PVFS_pinode_reference)));
- asymlink_refns = (PVFS_pinode_reference *)malloc(
- (levels * sizeof(PVFS_pinode_reference)));
+ rsymlink_refns = (PVFS_object_ref *)malloc(
+ (levels * sizeof(PVFS_object_ref)));
+ asymlink_refns = (PVFS_object_ref *)malloc(
+ (levels * sizeof(PVFS_object_ref)));
for(i = 0; i < levels; i++)
{
parent_refn = ((i == 0) ? base_refn : lookup_refns[i - 1]);
@@ -232,7 +232,7 @@ static int build_nested_path(int levels,
}
/* stash the newly created relative symlink references created */
- rsymlink_refns[i] = symlink_resp.pinode_refn;
+ rsymlink_refns[i] = symlink_resp.ref;
fprintf(stderr, "Generating absolute symlink %s "
"in %Lu,%d to point at %s\n", ABSOLUTE_SYMLINK_NAME,
@@ -248,7 +248,7 @@ static int build_nested_path(int levels,
}
/* stash the newly created absolute symlink references created */
- asymlink_refns[i] = symlink_resp.pinode_refn;
+ asymlink_refns[i] = symlink_resp.ref;
}
for(i = 0; i < levels; i++)
@@ -277,14 +277,14 @@ static int build_nested_path(int levels,
goto symlink_cleanup;
}
- if ((lookup_resp.pinode_refn.handle !=
+ if ((lookup_resp.ref.handle !=
rsymlink_refns[i].handle) ||
- (lookup_resp.pinode_refn.fs_id !=
+ (lookup_resp.ref.fs_id !=
rsymlink_refns[i].fs_id))
{
fprintf(stderr,"\nSymlink %s resolved to %Lu "
"but should have resolved to %Lu\n", tmp_buf,
- Lu(lookup_resp.pinode_refn.handle),
+ Lu(lookup_resp.ref.handle),
Lu(rsymlink_refns[i].handle));
goto symlink_cleanup;
}
@@ -304,14 +304,14 @@ static int build_nested_path(int levels,
goto symlink_cleanup;
}
- if ((lookup_resp.pinode_refn.handle !=
+ if ((lookup_resp.ref.handle !=
lookup_refns[i].handle) ||
- (lookup_resp.pinode_refn.fs_id !=
+ (lookup_resp.ref.fs_id !=
lookup_refns[i].fs_id))
{
fprintf(stderr,"\nSymlink %s resolved to %Lu "
"but should have resolved to %Lu\n", tmp_buf,
- Lu(lookup_resp.pinode_refn.handle),
+ Lu(lookup_resp.ref.handle),
Lu(lookup_refns[i].handle));
goto symlink_cleanup;
}
@@ -338,14 +338,14 @@ static int build_nested_path(int levels,
goto symlink_cleanup;
}
- if ((lookup_resp.pinode_refn.handle !=
+ if ((lookup_resp.ref.handle !=
asymlink_refns[i].handle) ||
- (lookup_resp.pinode_refn.fs_id !=
+ (lookup_resp.ref.fs_id !=
asymlink_refns[i].fs_id))
{
fprintf(stderr,"\nSymlink %s resolved to %Lu "
"but should have resolved to %Lu\n", tmp_buf,
- Lu(lookup_resp.pinode_refn.handle),
+ Lu(lookup_resp.ref.handle),
Lu(asymlink_refns[i].handle));
goto symlink_cleanup;
}
@@ -365,14 +365,14 @@ static int build_nested_path(int levels,
goto symlink_cleanup;
}
- if ((lookup_resp.pinode_refn.handle !=
+ if ((lookup_resp.ref.handle !=
lookup_refns[i].handle) ||
- (lookup_resp.pinode_refn.fs_id !=
+ (lookup_resp.ref.fs_id !=
lookup_refns[i].fs_id))
{
fprintf(stderr,"\nSymlink %s resolved to %Lu "
"but should have resolved to %Lu\n", tmp_buf,
- Lu(lookup_resp.pinode_refn.handle),
+ Lu(lookup_resp.ref.handle),
Lu(lookup_refns[i].handle));
goto symlink_cleanup;
}
Index: test-pvfs-datatype-contig.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-pvfs-datatype-contig.c,v
diff -p -u -r1.16 -r1.17
--- test-pvfs-datatype-contig.c 19 Mar 2004 18:54:03 -0000 1.16
+++ test-pvfs-datatype-contig.c 24 Mar 2004 23:10:34 -0000 1.17
@@ -75,7 +75,7 @@ int test_pvfs_datatype_contig(
break;
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer,
req_mem, credentials, &resp_io);
if(ret < 0)
{
@@ -88,7 +88,7 @@ int test_pvfs_datatype_contig(
/* now try to read the data back */
memset(io_buffer,0,TEST_PVFS_DATA_SIZE);
- ret = PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer,
+ ret = PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer,
req_mem, credentials, &resp_io);
if(ret < 0)
{
Index: test-pvfs-datatype-hvector.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-pvfs-datatype-hvector.c,v
diff -p -u -r1.17 -r1.18
--- test-pvfs-datatype-hvector.c 19 Mar 2004 18:54:03 -0000 1.17
+++ test-pvfs-datatype-hvector.c 24 Mar 2004 23:10:34 -0000 1.18
@@ -75,7 +75,7 @@ int test_pvfs_datatype_hvector(
break;
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer,
req_mem, credentials, &resp_io);
if(ret < 0)
{
@@ -88,7 +88,7 @@ int test_pvfs_datatype_hvector(
/* now try to read the data back */
memset(io_buffer,0,TEST_PVFS_DATA_SIZE);
- ret = PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer,
+ ret = PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer,
req_mem, credentials, &resp_io);
if(ret < 0)
{
Index: test-pvfs-datatype-init.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-pvfs-datatype-init.c,v
diff -p -u -r1.17 -r1.18
--- test-pvfs-datatype-init.c 19 Mar 2004 18:54:03 -0000 1.17
+++ test-pvfs-datatype-init.c 24 Mar 2004 23:10:34 -0000 1.18
@@ -70,7 +70,7 @@ int test_pvfs_datatype_init(
ret = PVFS_sys_lookup(pvfs_helper.fs_id,
"/", credentials, &resp_lk,
PVFS2_LOOKUP_LINK_NO_FOLLOW);
- if ((ret < 0) || (!resp_lk.pinode_refn.handle))
+ if ((ret < 0) || (!resp_lk.ref.handle))
{
debug_printf("Error: PVFS_sys_lookup() failed to find "
"root handle.\n");
@@ -85,21 +85,21 @@ int test_pvfs_datatype_init(
attr.atime = attr.mtime = attr.ctime =
time(NULL);
- ret = PVFS_sys_create(&(filename[1]),resp_lk.pinode_refn,
+ ret = PVFS_sys_create(&(filename[1]),resp_lk.ref,
attr, credentials, &resp_cr);
- if ((ret < 0) || (!resp_cr.pinode_refn.handle))
+ if ((ret < 0) || (!resp_cr.ref.handle))
{
debug_printf("Error: PVFS_sys_create() failure.\n");
break;
}
debug_printf("Created file %s\n",&(filename[1]));
- debug_printf("Got handle %Ld.\n", Ld(resp_cr.pinode_refn.handle));
+ debug_printf("Got handle %Ld.\n", Ld(resp_cr.ref.handle));
num_test_files_ok++;
}
else
{
debug_printf("lookup succeeded; skipping existing file.\n");
- debug_printf("Got handle %Ld.\n", Ld(resp_lk.pinode_refn.handle));
+ debug_printf("Got handle %Ld.\n", Ld(resp_lk.ref.handle));
num_test_files_ok++;
}
}
Index: test-pvfs-datatype-vector.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-pvfs-datatype-vector.c,v
diff -p -u -r1.16 -r1.17
--- test-pvfs-datatype-vector.c 19 Mar 2004 18:54:03 -0000 1.16
+++ test-pvfs-datatype-vector.c 24 Mar 2004 23:10:34 -0000 1.17
@@ -75,7 +75,7 @@ int test_pvfs_datatype_vector(
break;
}
- ret = PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer,
+ ret = PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer,
req_mem, credentials, &resp_io);
if(ret < 0)
{
@@ -88,7 +88,7 @@ int test_pvfs_datatype_vector(
/* now try to read the data back */
memset(io_buffer,0,TEST_PVFS_DATA_SIZE);
- ret = PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer,
+ ret = PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer,
req_mem, credentials, &resp_io);
if(ret < 0)
{
Index: test-uninitialized.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/correctness/pts/test-uninitialized.c,v
diff -p -u -r1.15 -r1.16
--- test-uninitialized.c 19 Mar 2004 18:54:03 -0000 1.15
+++ test-uninitialized.c 24 Mar 2004 23:10:34 -0000 1.16
@@ -57,7 +57,7 @@ static int test_getattr(void)
{
int fs_id, ret;
PVFS_credentials credentials;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
uint32_t attrmask;
PVFS_sysresp_lookup resp_lookup;
PVFS_sysresp_getattr resp_getattr;
@@ -79,7 +79,7 @@ static int test_getattr(void)
return ret;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
attrmask = PVFS_ATTR_SYS_ALL_NOSIZE;
ret = PVFS_sys_getattr(pinode_refn, attrmask, credentials, &resp_getattr);
@@ -102,7 +102,7 @@ static int test_setattr(void)
*/
static int test_mkdir(void)
{
- PVFS_pinode_reference parent_refn;
+ PVFS_object_ref parent_refn;
PVFS_sys_attr attr;
PVFS_sysresp_mkdir resp_mkdir;
@@ -126,7 +126,7 @@ static int test_mkdir(void)
return -1;
}
- parent_refn = resp_lookup.pinode_refn;
+ parent_refn = resp_lookup.ref;
attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
attr.owner = credentials.uid;
attr.group = credentials.gid;
@@ -148,7 +148,7 @@ static int test_readdir(void)
int ret;
- PVFS_pinode_reference pinode_refn;
+ PVFS_object_ref pinode_refn;
PVFS_ds_position token;
int pvfs_dirent_incount;
PVFS_credentials credentials;
@@ -173,7 +173,7 @@ static int test_readdir(void)
return -1;
}
- pinode_refn = resp_lookup.pinode_refn;
+ pinode_refn = resp_lookup.ref;
token = PVFS_READDIR_START;
pvfs_dirent_incount = 1;
@@ -218,7 +218,7 @@ static int test_create(void)
}
ret =
- PVFS_sys_create(filename, resp_look.pinode_refn, attr, credentials,
+ PVFS_sys_create(filename, resp_look.ref, attr, credentials,
&resp_create);
return ret;
}
@@ -251,7 +251,7 @@ static int test_remove(void)
printf("Lookup failed with errcode = %d\n", ret);
return (-1);
}
- ret = PVFS_sys_remove(filename, resp_look.pinode_refn, credentials);
+ ret = PVFS_sys_remove(filename, resp_look.ref, credentials);
return ret;
}
@@ -319,7 +319,7 @@ static int test_read(void)
}
ret =
- PVFS_sys_read(resp_lk.pinode_refn, req_io, 0, io_buffer, NULL, credentials,
+ PVFS_sys_read(resp_lk.ref, req_io, 0, io_buffer, NULL, credentials,
&resp_io);
return ret;
}
@@ -359,7 +359,7 @@ static int test_write(void)
}
ret =
- PVFS_sys_write(resp_lk.pinode_refn, req_io, 0, io_buffer, NULL, credentials,
+ PVFS_sys_write(resp_lk.ref, req_io, 0, io_buffer, NULL, credentials,
&resp_io);
return ret;
}
More information about the PVFS2-CVS
mailing list