[PVFS2-CVS]
commit by slang in pvfs2/src/server: chdirent.sm crdirent.sm
create.sm del-eattr.sm final-response.sm flush.sm get-attr.sm io.sm
lookup.sm mgmt-get-dirdata-handle.sm mgmt-remove-dirent.sm
mgmt-remove-object.sm mkdir.sm prelude.sm pvfs2-server.c
pvfs2-server.h readdir.sm remove.sm rmdirent.sm set-attr.sm
set-eattr.sm setparam.sm
CVS commit program
cvs at parl.clemson.edu
Wed Nov 9 20:27:14 EST 2005
Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb:/tmp/cvs-serv439/src/server
Modified Files:
chdirent.sm crdirent.sm create.sm del-eattr.sm
final-response.sm flush.sm get-attr.sm io.sm lookup.sm
mgmt-get-dirdata-handle.sm mgmt-remove-dirent.sm
mgmt-remove-object.sm mkdir.sm prelude.sm pvfs2-server.c
pvfs2-server.h readdir.sm remove.sm rmdirent.sm set-attr.sm
set-eattr.sm setparam.sm
Log Message:
* malloc.h is obsolete in freebsd, check for it
* No error.h in freebsd
* linux allows Lu,Lx, and Ld to be interchangeable with llu,llx, and
lld. Other platforms (solaris, bsd) don't. Replaced all the L*
with ll*.
* bsd doesn't have mntent.h. use fstab.h and our own funcs.
* bsd doesn't know about ssize_t. Use size_t instead.
* bsd doesn't have asm errnos. Check for each of those
errno macros and if not defined define to -1
* check for db3/db.h db4/db.h header if db path is specified using
--with-db
* darwin has aio support builtin, doesn't need -lrt
* remove kernel stuff in pvfs2-types.h that sets WORDSIZE. gcc
defines __LP64__ on archs with 64bit longs so we use that instead.
* darwin's open doesn't accept O_LARGEFILE. off_t is an int64 by
default. define O_LARGEFILE if it hasn't been.
* need to run ranlib on darwin after libpvfs2.a gets installed to regenerate
table of contents
Index: chdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/chdirent.sm,v
diff -p -u -r1.7 -r1.8
--- chdirent.sm 27 Oct 2005 19:02:10 -0000 1.7
+++ chdirent.sm 10 Nov 2005 01:27:12 -0000 1.8
@@ -145,10 +145,10 @@ static int chdirent_verify_parent_metada
gossip_debug(
GOSSIP_SERVER_DEBUG,
- " reading dirdata handle (coll_id = 0x%x, handle = %Lu, "
+ " reading dirdata handle (coll_id = 0x%x, handle = %llu, "
"key = %s (%d), val_buf = %p (%d))\n",
s_op->req->u.chdirent.fs_id,
- Lu(s_op->req->u.chdirent.parent_handle),
+ llu(s_op->req->u.chdirent.parent_handle),
(char *) s_op->key.buffer,
s_op->key.buffer_sz,
s_op->val.buffer,
@@ -179,8 +179,8 @@ static int chdirent_read_directory_entry
PINT_STATE_DEBUG("read_directory_entry");
gossip_debug(GOSSIP_SERVER_DEBUG,
- " reading from dirent handle = %Lu, name = %s\n",
- Lu(s_op->u.chdirent.dirdata_handle),
+ " reading from dirent handle = %llu, name = %s\n",
+ llu(s_op->u.chdirent.dirdata_handle),
s_op->req->u.chdirent.entry);
s_op->key.buffer = s_op->req->u.chdirent.entry;
@@ -251,9 +251,9 @@ static int chdirent_change_directory_ent
gossip_debug(GOSSIP_SERVER_DEBUG,
" changing dir entry for %s from handle value "
- "%Lu to %Lu\n", s_op->req->u.chdirent.entry,
- Lu(s_op->u.chdirent.old_dirent_handle),
- Lu(s_op->u.chdirent.new_dirent_handle));
+ "%llu to %llu\n", s_op->req->u.chdirent.entry,
+ llu(s_op->u.chdirent.old_dirent_handle),
+ llu(s_op->u.chdirent.new_dirent_handle));
ret = job_trove_keyval_write(
s_op->req->u.chdirent.fs_id, s_op->u.chdirent.dirdata_handle,
@@ -319,9 +319,9 @@ static int chdirent_update_directory_att
*/
gossip_debug(
GOSSIP_SERVER_DEBUG, "updating parent dir version "
- "to %Lu\n\tmtime is %Lu\n",
- Lu(PVFS_util_mktime_version(s_op->req->u.chdirent.parent_mtime)),
- Lu(s_op->req->u.chdirent.parent_mtime));
+ "to %llu\n\tmtime is %llu\n",
+ llu(PVFS_util_mktime_version(s_op->req->u.chdirent.parent_mtime)),
+ llu(s_op->req->u.chdirent.parent_mtime));
tmp_attr_ptr->mtime = PVFS_util_mktime_version(
s_op->req->u.chdirent.parent_mtime);
@@ -374,8 +374,8 @@ static int chdirent_setup_resp(PINT_serv
s_op->u.chdirent.old_dirent_handle;
gossip_debug(GOSSIP_SERVER_DEBUG,
- " succeeded; returning handle %Lu in response\n",
- Lu(s_op->resp.u.chdirent.old_dirent_handle));
+ " succeeded; returning handle %llu in response\n",
+ llu(s_op->resp.u.chdirent.old_dirent_handle));
}
else
{
Index: crdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/crdirent.sm,v
diff -p -u -r1.54 -r1.55
--- crdirent.sm 27 Oct 2005 19:02:11 -0000 1.54
+++ crdirent.sm 10 Nov 2005 01:27:13 -0000 1.55
@@ -188,10 +188,10 @@ static int crdirent_validate(PINT_server
}
gossip_debug(GOSSIP_SERVER_DEBUG,
- " got crdirent for %s (with handle %Lu) in %Lu\n",
+ " got crdirent for %s (with handle %llu) in %llu\n",
s_op->u.crdirent.name,
- Lu(s_op->u.crdirent.new_handle),
- Lu(s_op->u.crdirent.parent_handle));
+ llu(s_op->u.crdirent.new_handle),
+ llu(s_op->u.crdirent.parent_handle));
/* check for invalid characters in name */
ptr = s_op->u.crdirent.name;
@@ -333,9 +333,9 @@ static int crdirent_create_dirdata_dspac
assert(extent_array.extent_count > 0);
gossip_debug(GOSSIP_SERVER_DEBUG, " new handle should be in range "
- "starting with %Lu-%Lu\n",
- Lu(extent_array.extent_array[0].first),
- Lu(extent_array.extent_array[0].last));
+ "starting with %llu-%llu\n",
+ llu(extent_array.extent_array[0].first),
+ llu(extent_array.extent_array[0].last));
ret = job_trove_dspace_create(
s_op->u.crdirent.fs_id,
@@ -402,10 +402,10 @@ static int crdirent_write_dirdata_handle
s_op->val.buffer_sz = sizeof(PVFS_handle);
gossip_debug(
- GOSSIP_SERVER_DEBUG, " writing dirdata handle (%Lu) "
- "into parent directory keyval space (%Lu)\n",
- Lu(s_op->u.crdirent.dirent_handle),
- Lu(s_op->u.crdirent.parent_handle));
+ GOSSIP_SERVER_DEBUG, " writing dirdata handle (%llu) "
+ "into parent directory keyval space (%llu)\n",
+ llu(s_op->u.crdirent.dirent_handle),
+ llu(s_op->u.crdirent.parent_handle));
ret = job_trove_keyval_write(
s_op->u.crdirent.fs_id,
@@ -466,9 +466,9 @@ static int crdirent_write_directory_entr
s_op->val.buffer_sz = sizeof(PVFS_handle);
gossip_debug(GOSSIP_SERVER_DEBUG, " writing new directory entry "
- "for %s (handle = %Lu) to dirdata dspace %Lu\n",
- s_op->u.crdirent.name, Lu(s_op->u.crdirent.new_handle),
- Lu(s_op->u.crdirent.dirent_handle));
+ "for %s (handle = %llu) to dirdata dspace %llu\n",
+ s_op->u.crdirent.name, llu(s_op->u.crdirent.new_handle),
+ llu(s_op->u.crdirent.dirent_handle));
ret = job_trove_keyval_write(
s_op->u.crdirent.fs_id, s_op->u.crdirent.dirent_handle,
@@ -540,9 +540,9 @@ static int crdirent_update_directory_att
*/
gossip_debug(
GOSSIP_SERVER_DEBUG, "updating parent dir version "
- "to %Lu\n\tmtime is %Lu\n",
- Lu(PVFS_util_mktime_version(s_op->req->u.crdirent.parent_mtime)),
- Lu(s_op->req->u.crdirent.parent_mtime));
+ "to %llu\n\tmtime is %llu\n",
+ llu(PVFS_util_mktime_version(s_op->req->u.crdirent.parent_mtime)),
+ llu(s_op->req->u.crdirent.parent_mtime));
tmp_attr_ptr->mtime = PVFS_util_mktime_version(
s_op->req->u.crdirent.parent_mtime);
@@ -605,9 +605,9 @@ static int crdirent_check_exist_director
gossip_debug(
GOSSIP_SERVER_DEBUG, " checking existence of new directory "
- "entry for %s (handle = %Lu) to dirdata dspace %Lu\n",
- s_op->u.crdirent.name, Lu(s_op->u.crdirent.new_handle),
- Lu(s_op->u.crdirent.dirent_handle));
+ "entry for %s (handle = %llu) to dirdata dspace %llu\n",
+ s_op->u.crdirent.name, llu(s_op->u.crdirent.new_handle),
+ llu(s_op->u.crdirent.dirent_handle));
ret = job_trove_keyval_read(
s_op->u.crdirent.fs_id, s_op->u.crdirent.dirent_handle,
@@ -659,8 +659,8 @@ static int crdirent_setup_op(
PINT_server_op *s_op, job_status_s *js_p)
{
PINT_STATE_DEBUG("setup_op");
- PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "crdirent entry: %s points to %Lu\n",
- s_op->req->u.crdirent.name, Lu(s_op->req->u.crdirent.new_handle));
+ PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "crdirent entry: %s points to %llu\n",
+ s_op->req->u.crdirent.name, llu(s_op->req->u.crdirent.new_handle));
s_op->u.crdirent.name = s_op->req->u.crdirent.name;
s_op->u.crdirent.new_handle = s_op->req->u.crdirent.new_handle;
Index: create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/create.sm,v
diff -p -u -r1.37 -r1.38
--- create.sm 2 Aug 2005 17:58:55 -0000 1.37
+++ create.sm 10 Nov 2005 01:27:13 -0000 1.38
@@ -111,34 +111,34 @@ static int create_setup_resp(PINT_server
if (js_p->error_code == 0)
{
- gossip_debug(GOSSIP_SERVER_DEBUG, "Handle created: %Lu\n",
- Lu(js_p->handle));
+ gossip_debug(GOSSIP_SERVER_DEBUG, "Handle created: %llu\n",
+ llu(js_p->handle));
s_op->resp.u.create.handle = js_p->handle;
switch(s_op->req->u.create.object_type)
{
case PVFS_TYPE_NONE:
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG,
- "new handle: %Lu, type unknown.\n");
+ "new handle: %llu, type unknown.\n");
break;
case PVFS_TYPE_METAFILE:
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG,
- "new handle: %Lu, type metafile.\n");
+ "new handle: %llu, type metafile.\n");
break;
case PVFS_TYPE_DATAFILE:
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG,
- "new handle: %Lu, type datafile.\n");
+ "new handle: %llu, type datafile.\n");
break;
case PVFS_TYPE_DIRECTORY:
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG,
- "new handle: %Lu, type directory.\n");
+ "new handle: %llu, type directory.\n");
break;
case PVFS_TYPE_SYMLINK:
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG,
- "new handle: %Lu, type symlink.\n");
+ "new handle: %llu, type symlink.\n");
break;
case PVFS_TYPE_DIRDATA:
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG,
- "new handle: %Lu, type dirdata.\n");
+ "new handle: %llu, type dirdata.\n");
break;
}
}
Index: del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/del-eattr.sm,v
diff -p -u -r1.2 -r1.3
--- del-eattr.sm 21 Jul 2005 16:17:57 -0000 1.2
+++ del-eattr.sm 10 Nov 2005 01:27:13 -0000 1.3
@@ -108,9 +108,9 @@ static int deleattr_verify_eattribs(
js_p->error_code = 0;
gossip_debug(GOSSIP_DELEATTR_DEBUG,
- " ext attr delete from handle %Lu refers to a %s\n\t"
+ " ext attr delete from handle %llu refers to a %s\n\t"
"[owner = %d, group = %d, perms = %o, type = %d]\n",
- Lu(s_op->req->u.deleattr.handle),
+ llu(s_op->req->u.deleattr.handle),
get_object_type(a_p->objtype),
a_p->owner, a_p->group, a_p->perms, a_p->objtype);
@@ -182,9 +182,9 @@ static int deleattr_delobj_eattribs(PINT
gossip_debug(
GOSSIP_DELEATTR_DEBUG,
- " writing %s [%Lu,%d,len %d]\n",
+ " writing %s [%llu,%d,len %d]\n",
(char *)s_op->key.buffer,
- Lu(s_op->req->u.deleattr.handle),
+ llu(s_op->req->u.deleattr.handle),
s_op->req->u.deleattr.fs_id,
s_op->val.buffer_sz);
Index: final-response.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/final-response.sm,v
diff -p -u -r1.25 -r1.26
--- final-response.sm 27 Oct 2005 18:43:10 -0000 1.25
+++ final-response.sm 10 Nov 2005 01:27:13 -0000 1.26
@@ -249,15 +249,15 @@ static void PINT_gossip_err_server_resp(
{
for(i = 0; i < attr->u.meta.dfile_count; i++)
{
- gossip_err(" DATA HANDLE[%d] is %Lu\n", i,
- Lu(attr->u.meta.dfile_array[i]));
+ gossip_err(" DATA HANDLE[%d] is %llu\n", i,
+ llu(attr->u.meta.dfile_array[i]));
}
}
}
break;
case PVFS_TYPE_DATAFILE:
- gossip_err("DATAFILE [ size is %Ld ]\n",
- Ld(attr->u.data.size));
+ gossip_err("DATAFILE [ size is %lld ]\n",
+ lld(attr->u.data.size));
break;
case PVFS_TYPE_SYMLINK:
gossip_err(
Index: flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/flush.sm,v
diff -p -u -r1.15 -r1.16
--- flush.sm 17 Sep 2004 21:15:44 -0000 1.15
+++ flush.sm 10 Nov 2005 01:27:13 -0000 1.16
@@ -139,8 +139,8 @@ static int flush_keyval_flush(PINT_serve
PINT_STATE_DEBUG("kflush");
- gossip_debug(GOSSIP_SERVER_DEBUG, " doing keyval flush on %Lu,%d\n",
- Lu(s_op->req->u.flush.handle), s_op->req->u.flush.fs_id);
+ gossip_debug(GOSSIP_SERVER_DEBUG, " doing keyval flush on %llu,%d\n",
+ llu(s_op->req->u.flush.handle), s_op->req->u.flush.fs_id);
ret = job_trove_keyval_flush(
s_op->req->u.flush.fs_id,
@@ -164,8 +164,8 @@ static int flush_check_error(PINT_server
{
PVFS_strerror_r(js_p->error_code, buf, 64);
- gossip_err("failed to flush handle %Lu: %s\n",
- Lu(s_op->req->u.flush.handle), buf);
+ gossip_err("failed to flush handle %llu: %s\n",
+ llu(s_op->req->u.flush.handle), buf);
}
return 1;
}
@@ -190,8 +190,8 @@ static int flush_bstream_flush(PINT_serv
PINT_STATE_DEBUG("bflush");
- gossip_debug(GOSSIP_SERVER_DEBUG, " doing bstream flush on %Lu,%d\n",
- Lu(s_op->req->u.flush.handle), s_op->req->u.flush.fs_id);
+ gossip_debug(GOSSIP_SERVER_DEBUG, " doing bstream flush on %llu,%d\n",
+ llu(s_op->req->u.flush.handle), s_op->req->u.flush.fs_id);
ret = job_trove_bstream_flush(
s_op->req->u.flush.fs_id,
Index: get-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-attr.sm,v
diff -p -u -r1.69 -r1.70
--- get-attr.sm 2 Aug 2005 17:58:55 -0000 1.69
+++ get-attr.sm 10 Nov 2005 01:27:13 -0000 1.70
@@ -233,13 +233,13 @@ static int getattr_verify_attribs(
resp_attr->mtime = s_op->attr.mtime;
gossip_debug(GOSSIP_GETATTR_DEBUG, " No version found! Using "
- "mtime %Lu\n", Lu(resp_attr->mtime));
+ "mtime %llu\n", llu(resp_attr->mtime));
}
else
{
gossip_debug(
- GOSSIP_GETATTR_DEBUG, " VERSION is %Lu, mtime is %Lu\n",
- Lu(s_op->attr.mtime), Lu(resp_attr->mtime));
+ GOSSIP_GETATTR_DEBUG, " VERSION is %llu, mtime is %llu\n",
+ llu(s_op->attr.mtime), llu(resp_attr->mtime));
}
resp_attr->ctime = s_op->attr.ctime;
@@ -252,11 +252,11 @@ static int getattr_verify_attribs(
gossip_debug(
GOSSIP_GETATTR_DEBUG,
"+ _DSPACE_ retrieved attrs: [owner = %d, group = %d\n\t"
- "perms = %o, type = %d, atime = %Lu, mtime = %Lu\n\t"
- "ctime = %Lu, dfile_count = %d, dist_size = %d]\n",
+ "perms = %o, type = %d, atime = %llu, mtime = %llu\n\t"
+ "ctime = %llu, dfile_count = %d, dist_size = %d]\n",
resp_attr->owner, resp_attr->group, resp_attr->perms,
- resp_attr->objtype, Lu(resp_attr->atime),
- Lu(resp_attr->mtime), Lu(resp_attr->ctime),
+ resp_attr->objtype, llu(resp_attr->atime),
+ llu(resp_attr->mtime), llu(resp_attr->ctime),
(int)resp_attr->u.meta.dfile_count,
(int)resp_attr->u.meta.dist_size);
#endif
@@ -276,8 +276,8 @@ static int getattr_verify_attribs(
{
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "type: metafile\n");
gossip_debug(GOSSIP_GETATTR_DEBUG,
- " Req handle %Lu refers to a metafile\n",
- Lu(s_op->u.getattr.handle));
+ " Req handle %llu refers to a metafile\n",
+ llu(s_op->u.getattr.handle));
if (s_op->u.getattr.attrmask & PVFS_ATTR_META_DFILES)
{
@@ -335,10 +335,10 @@ static int getattr_verify_attribs(
resp_attr->u.data.size = s_op->ds_attr.b_size;
resp_attr->mask |= PVFS_ATTR_DATA_ALL;
- gossip_debug(GOSSIP_GETATTR_DEBUG, " handle %Lu refers to "
- "a datafile (size = %Ld).\n",
- Lu(s_op->u.getattr.handle),
- Ld(resp_attr->u.data.size));
+ gossip_debug(GOSSIP_GETATTR_DEBUG, " handle %llu refers to "
+ "a datafile (size = %lld).\n",
+ llu(s_op->u.getattr.handle),
+ lld(resp_attr->u.data.size));
}
else if (resp_attr->objtype == PVFS_TYPE_DIRECTORY)
{
@@ -363,17 +363,17 @@ static int getattr_verify_attribs(
{
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "type: dirdata\n");
gossip_debug(
- GOSSIP_GETATTR_DEBUG, " handle %Lu refers to "
+ GOSSIP_GETATTR_DEBUG, " handle %llu refers to "
"a dirdata object. doing nothing special\n",
- Lu(s_op->u.getattr.handle));
+ llu(s_op->u.getattr.handle));
assert(resp_attr->mask & PVFS_ATTR_COMMON_ALL);
}
else if (resp_attr->objtype == PVFS_TYPE_SYMLINK)
{
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "type: symlink\n");
gossip_debug(
- GOSSIP_GETATTR_DEBUG, " handle %Lu refers to a symlink.\n",
- Lu(s_op->u.getattr.handle));
+ GOSSIP_GETATTR_DEBUG, " handle %llu refers to a symlink.\n",
+ llu(s_op->u.getattr.handle));
/*
we'll definitely have to fetch the symlink target in this
@@ -384,18 +384,18 @@ static int getattr_verify_attribs(
else
{
gossip_debug(
- GOSSIP_GETATTR_DEBUG, " handle %Lu refers to something "
+ GOSSIP_GETATTR_DEBUG, " handle %llu refers to something "
"unknown -- assuming datafile!\n",
- Lu(s_op->u.getattr.handle));
+ llu(s_op->u.getattr.handle));
resp_attr->objtype = PVFS_TYPE_DATAFILE;
resp_attr->u.data.size = s_op->ds_attr.b_size;
resp_attr->mask |= (PVFS_ATTR_COMMON_TYPE | PVFS_ATTR_DATA_ALL);
- gossip_debug(GOSSIP_GETATTR_DEBUG, " handle %Lu now refers to "
- "a datafile (size = %Ld).\n",
- Lu(s_op->u.getattr.handle),
- Ld(resp_attr->u.data.size));
+ gossip_debug(GOSSIP_GETATTR_DEBUG, " handle %llu now refers to "
+ "a datafile (size = %lld).\n",
+ llu(s_op->u.getattr.handle),
+ lld(resp_attr->u.data.size));
}
return 1;
}
@@ -480,20 +480,20 @@ static int getattr_read_metafile_datafil
"aborting operation.\n", dfile_count);
gossip_err(
"+ attrs read from dspace: (owner = %d, group = %d, "
- "perms = %o, type = %d\n atime = %Ld, mtime = %Ld, "
- "ctime = %Ld |\n dfile_count = %d | dist_size = %d)\n",
+ "perms = %o, type = %d\n atime = %lld, mtime = %lld, "
+ "ctime = %lld |\n dfile_count = %d | dist_size = %d)\n",
s_op->resp.u.getattr.attr.owner,
s_op->resp.u.getattr.attr.group,
s_op->resp.u.getattr.attr.perms,
s_op->resp.u.getattr.attr.objtype,
- Ld(s_op->resp.u.getattr.attr.atime),
- Ld(s_op->resp.u.getattr.attr.mtime),
- Ld(s_op->resp.u.getattr.attr.ctime),
+ lld(s_op->resp.u.getattr.attr.atime),
+ lld(s_op->resp.u.getattr.attr.mtime),
+ lld(s_op->resp.u.getattr.attr.ctime),
(int)s_op->resp.u.getattr.attr.u.meta.dfile_count,
(int)s_op->resp.u.getattr.attr.u.meta.dist_size);
- gossip_err("handle: %Lu (%Lx), fsid: %d.\n",
- Lu(s_op->u.getattr.handle), Lu(s_op->u.getattr.handle),
+ gossip_err("handle: %llu (%llx), fsid: %d.\n",
+ llu(s_op->u.getattr.handle), llu(s_op->u.getattr.handle),
(int)s_op->u.getattr.fs_id);
js_p->error_code = -PVFS_EOVERFLOW;
@@ -521,9 +521,9 @@ static int getattr_read_metafile_datafil
gossip_debug(GOSSIP_GETATTR_DEBUG,
" reading %d datafile handles (coll_id = %d, "
- "handle = %Lu, key = %s (%d), val_buf = %p (%d))\n",
+ "handle = %llu, key = %s (%d), val_buf = %p (%d))\n",
dfile_count, s_op->u.getattr.fs_id,
- Lu(s_op->u.getattr.handle), (char *)s_op->key.buffer,
+ llu(s_op->u.getattr.handle), (char *)s_op->key.buffer,
s_op->key.buffer_sz, s_op->val.buffer,
s_op->val.buffer_sz);
@@ -566,7 +566,7 @@ static int getattr_read_metafile_distrib
if (s_op->resp.u.getattr.attr.u.meta.dist_size < 1)
{
gossip_err("Cannot Read Dist! Got an invalid dist size for "
- "handle %Lu,%d\n",Lu(s_op->u.getattr.handle),
+ "handle %llu,%d\n",llu(s_op->u.getattr.handle),
s_op->u.getattr.fs_id);
js_p->error_code = -PVFS_EINVAL;
return 1;
@@ -606,11 +606,11 @@ static int getattr_setup_resp(PINT_serve
gossip_debug(
GOSSIP_GETATTR_DEBUG,
"- RETURNING retrieved attrs: [owner = %d, group = %d\n\t"
- "perms = %o, type = %d, atime = %Lu, mtime = %Lu\n\t"
- "ctime = %Lu, dfile_count = %d, dist_size = %d]\n",
+ "perms = %o, type = %d, atime = %llu, mtime = %llu\n\t"
+ "ctime = %llu, dfile_count = %d, dist_size = %d]\n",
resp_attr->owner, resp_attr->group, resp_attr->perms,
- resp_attr->objtype, Lu(resp_attr->atime),
- Lu(resp_attr->mtime), Lu(resp_attr->ctime),
+ resp_attr->objtype, llu(resp_attr->atime),
+ llu(resp_attr->mtime), llu(resp_attr->ctime),
(int)resp_attr->u.meta.dfile_count,
(int)resp_attr->u.meta.dist_size);
@@ -630,8 +630,8 @@ static int getattr_setup_resp(PINT_serve
if (resp_attr->mask & PVFS_ATTR_META_DIST)
{
if(resp_attr->u.meta.dist == 0) {
- gossip_err("Found dist of 0 for handle %Lu,%d\n",
- Lu(s_op->u.getattr.handle), s_op->u.getattr.fs_id);
+ gossip_err("Found dist of 0 for handle %llu,%d\n",
+ llu(s_op->u.getattr.handle), s_op->u.getattr.fs_id);
PVFS_perror("Metafile getattr_setup_resp",js_p->error_code);
js_p->error_code = -PVFS_EIO;
return 1;
@@ -646,8 +646,8 @@ static int getattr_setup_resp(PINT_serve
(resp_attr->mask & PVFS_ATTR_DATA_SIZE))
{
gossip_debug(GOSSIP_GETATTR_DEBUG,
- " also returning data size of %Ld\n",
- Ld(resp_attr->u.data.size));
+ " also returning data size of %lld\n",
+ lld(resp_attr->u.data.size));
}
else if ((resp_attr->objtype == PVFS_TYPE_SYMLINK) &&
(resp_attr->mask & PVFS_ATTR_SYMLNK_TARGET))
@@ -671,7 +671,7 @@ static int getattr_setup_resp(PINT_serve
else
{
gossip_err("Failed to retrieve symlink target path for "
- "handle %Lu,%d\n",Lu(s_op->u.getattr.handle),
+ "handle %llu,%d\n",llu(s_op->u.getattr.handle),
s_op->u.getattr.fs_id);
PVFS_perror("Symlink retrieval failure",js_p->error_code);
@@ -744,8 +744,8 @@ static int getattr_get_dirent_count(
PINT_STATE_DEBUG("get_dirent_count");
gossip_debug(GOSSIP_SERVER_DEBUG, " trying to getattr of "
- "dirdata handle (coll_id = %d, handle = %Lu\n",
- s_op->u.getattr.fs_id, Lu(s_op->u.getattr.dirdata_handle));
+ "dirdata handle (coll_id = %d, handle = %llu\n",
+ s_op->u.getattr.fs_id, llu(s_op->u.getattr.dirdata_handle));
ret = job_trove_dspace_getattr(
s_op->u.getattr.fs_id, s_op->u.getattr.dirdata_handle, s_op,
@@ -763,8 +763,8 @@ static int getattr_interpret_dirent_coun
s_op->resp.u.getattr.attr.u.dir.dirent_count =
s_op->u.getattr.dirdata_ds_attr.k_size;
- gossip_debug(GOSSIP_GETATTR_DEBUG, "getattr: dirent_count: %Ld\n",
- Ld(s_op->resp.u.getattr.attr.u.dir.dirent_count));
+ gossip_debug(GOSSIP_GETATTR_DEBUG, "getattr: dirent_count: %lld\n",
+ lld(s_op->resp.u.getattr.attr.u.dir.dirent_count));
js_p->error_code = 0;
return 1;
Index: io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/io.sm,v
diff -p -u -r1.57 -r1.58
--- io.sm 2 Aug 2005 17:58:55 -0000 1.57
+++ io.sm 10 Nov 2005 01:27:13 -0000 1.58
@@ -204,17 +204,17 @@ static int io_start_flow(PINT_server_op
s_op->u.io.flow_d->user_ptr = NULL;
s_op->u.io.flow_d->type = s_op->req->u.io.flow_type;
- gossip_debug(GOSSIP_IO_DEBUG, "flow: fsize: %Ld, "
+ gossip_debug(GOSSIP_IO_DEBUG, "flow: fsize: %lld, "
"server_nr: %d, server_ct: %d\n",
- Ld(s_op->u.io.flow_d->file_data.fsize),
+ lld(s_op->u.io.flow_d->file_data.fsize),
(int)s_op->u.io.flow_d->file_data.server_nr,
(int)s_op->u.io.flow_d->file_data.server_ct);
- gossip_debug(GOSSIP_IO_DEBUG, " file_req_offset: %Ld, "
- "aggregate_size: %Ld, handle: %Lu\n",
- Ld(s_op->u.io.flow_d->file_req_offset),
- Ld(s_op->u.io.flow_d->aggregate_size),
- Lu(s_op->req->u.io.handle));
+ gossip_debug(GOSSIP_IO_DEBUG, " file_req_offset: %lld, "
+ "aggregate_size: %lld, handle: %llu\n",
+ lld(s_op->u.io.flow_d->file_req_offset),
+ lld(s_op->u.io.flow_d->aggregate_size),
+ llu(s_op->req->u.io.handle));
/* set endpoints depending on type of io requested */
if (s_op->req->u.io.io_type == PVFS_IO_WRITE)
Index: lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/lookup.sm,v
diff -p -u -r1.41 -r1.42
--- lookup.sm 2 Aug 2005 17:58:55 -0000 1.41
+++ lookup.sm 10 Nov 2005 01:27:13 -0000 1.42
@@ -8,7 +8,10 @@
#include <stddef.h>
#include <assert.h>
#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include "server-config.h"
#include "pvfs2-server.h"
@@ -383,8 +386,8 @@ static int lookup_read_directory_entry_h
}
gossip_debug(GOSSIP_SERVER_DEBUG,
- " reading dirent handle value from handle %Lu\n",
- Lu(handle));
+ " reading dirent handle value from handle %llu\n",
+ llu(handle));
s_op->key.buffer = Trove_Common_Keys[DIR_ENT_KEY].key;
s_op->key.buffer_sz = Trove_Common_Keys[DIR_ENT_KEY].size;
@@ -414,7 +417,7 @@ static int lookup_read_directory_entry(
gossip_debug(
GOSSIP_SERVER_DEBUG, " reading from dirent handle = "
- "%Lu, segment = %s (len=%d)\n", Lu(s_op->u.lookup.dirent_handle),
+ "%llu, segment = %s (len=%d)\n", llu(s_op->u.lookup.dirent_handle),
s_op->u.lookup.segp, (int) strlen(s_op->u.lookup.segp));
s_op->key.buffer = s_op->u.lookup.segp;
@@ -474,9 +477,9 @@ static int lookup_setup_resp(PINT_server
if(js_p->error_code == 0)
{
- PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "path: %s, handle: %Lu\n",
+ PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "path: %s, handle: %llu\n",
s_op->req->u.lookup_path.path,
- Lu(s_op->resp.u.lookup_path.handle_array[s_op->resp.u.lookup_path.handle_count-1]));
+ llu(s_op->resp.u.lookup_path.handle_array[s_op->resp.u.lookup_path.handle_count-1]));
}
else
{
Index: mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mgmt-get-dirdata-handle.sm,v
diff -p -u -r1.1 -r1.2
--- mgmt-get-dirdata-handle.sm 24 Aug 2004 14:57:29 -0000 1.1
+++ mgmt-get-dirdata-handle.sm 10 Nov 2005 01:27:13 -0000 1.2
@@ -82,10 +82,10 @@ static int mgmt_get_dirdata_handle_from_
gossip_debug(
GOSSIP_SERVER_DEBUG,
- " reading dirdata handle (coll_id = %d, handle = %Lu\n\t"
+ " reading dirdata handle (coll_id = %d, handle = %llu\n\t"
"key = %s (%d), val_buf = %p (%d))\n",
s_op->req->u.mgmt_get_dirdata_handle.fs_id,
- Lu(s_op->req->u.mgmt_get_dirdata_handle.handle),
+ llu(s_op->req->u.mgmt_get_dirdata_handle.handle),
(char *)s_op->key.buffer, s_op->key.buffer_sz,
s_op->val.buffer, s_op->val.buffer_sz);
@@ -109,17 +109,17 @@ static int mgmt_get_dirdata_handle_setup
s_op->u.mgmt_get_dirdata_handle.dirdata_handle;
gossip_debug(
- GOSSIP_SERVER_DEBUG, " Found dirdata handle %Lu of parent "
- "%Lu\n", Lu(s_op->u.mgmt_get_dirdata_handle.dirdata_handle),
- Lu(s_op->req->u.mgmt_get_dirdata_handle.handle));
+ GOSSIP_SERVER_DEBUG, " Found dirdata handle %llu of parent "
+ "%llu\n", llu(s_op->u.mgmt_get_dirdata_handle.dirdata_handle),
+ llu(s_op->req->u.mgmt_get_dirdata_handle.handle));
}
else
{
s_op->resp.u.mgmt_get_dirdata_handle.handle = PVFS_HANDLE_NULL;
gossip_debug(GOSSIP_SERVER_DEBUG, "Failed to retrieve dirdata "
- "handle from parent %Lu\n",
- Lu(s_op->req->u.mgmt_get_dirdata_handle.handle));
+ "handle from parent %llu\n",
+ llu(s_op->req->u.mgmt_get_dirdata_handle.handle));
}
return 1;
}
Index: mgmt-remove-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mgmt-remove-dirent.sm,v
diff -p -u -r1.2 -r1.3
--- mgmt-remove-dirent.sm 12 Aug 2004 19:53:41 -0000 1.2
+++ mgmt-remove-dirent.sm 10 Nov 2005 01:27:13 -0000 1.3
@@ -82,10 +82,10 @@ static int mgmt_remove_dirent_get_dirdat
gossip_debug(
GOSSIP_SERVER_DEBUG,
- " reading dirdata handle (coll_id = %d, handle = %Lu, "
+ " reading dirdata handle (coll_id = %d, handle = %llu, "
"key = %s (%d), val_buf = %p (%d))\n",
s_op->req->u.mgmt_remove_dirent.fs_id,
- Lu(s_op->req->u.mgmt_remove_dirent.handle),
+ llu(s_op->req->u.mgmt_remove_dirent.handle),
(char *) s_op->key.buffer, s_op->key.buffer_sz,
s_op->val.buffer, s_op->val.buffer_sz);
@@ -113,8 +113,8 @@ static int mgmt_remove_dirent(
gossip_debug(
GOSSIP_SERVER_DEBUG, " removing entry %s from dirdata "
- "object (handle = %Lu)\n", s_op->req->u.mgmt_remove_dirent.entry,
- Lu(s_op->u.mgmt_remove_dirent.dirdata_handle));
+ "object (handle = %llu)\n", s_op->req->u.mgmt_remove_dirent.entry,
+ llu(s_op->u.mgmt_remove_dirent.dirdata_handle));
ret = job_trove_keyval_remove(
s_op->req->u.mgmt_remove_dirent.fs_id,
Index: mgmt-remove-object.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mgmt-remove-object.sm,v
diff -p -u -r1.5 -r1.6
--- mgmt-remove-object.sm 12 Aug 2004 19:53:41 -0000 1.5
+++ mgmt-remove-object.sm 10 Nov 2005 01:27:13 -0000 1.6
@@ -66,8 +66,8 @@ static int mgmt_remove_dspace(
PINT_STATE_DEBUG("mgmt_remove_dspace");
gossip_debug(
- GOSSIP_SERVER_DEBUG, "Trying to mgmt_remove object %Lu,%d\n",
- Lu(s_op->req->u.mgmt_remove_object.handle),
+ GOSSIP_SERVER_DEBUG, "Trying to mgmt_remove object %llu,%d\n",
+ llu(s_op->req->u.mgmt_remove_object.handle),
s_op->req->u.mgmt_remove_object.fs_id);
ret = job_trove_dspace_remove(
Index: mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mkdir.sm,v
diff -p -u -r1.38 -r1.39
--- mkdir.sm 27 Oct 2004 19:12:27 -0000 1.38
+++ mkdir.sm 10 Nov 2005 01:27:13 -0000 1.39
@@ -138,9 +138,9 @@ static int mkdir_create(PINT_server_op *
gossip_debug(
GOSSIP_MKDIR_DEBUG, " directory handle will "
- "be in starting hrange[0] %Lu-%Lu\n",
- Lu(s_op->u.mkdir.handle_extent_array.extent_array[0].first),
- Lu(s_op->u.mkdir.handle_extent_array.extent_array[0].last));
+ "be in starting hrange[0] %llu-%llu\n",
+ llu(s_op->u.mkdir.handle_extent_array.extent_array[0].first),
+ llu(s_op->u.mkdir.handle_extent_array.extent_array[0].last));
ret = job_trove_dspace_create(
s_op->u.mkdir.fs_id, &s_op->u.mkdir.handle_extent_array,
@@ -175,14 +175,14 @@ static int mkdir_setattrib(PINT_server_o
/* save the handle from the mkdir in the response */
s_op->resp.u.mkdir.handle = js_p->handle;
- gossip_debug(GOSSIP_MKDIR_DEBUG, " *** new directory has handle %Lu\n",
- Lu(js_p->handle));
+ gossip_debug(GOSSIP_MKDIR_DEBUG, " *** new directory has handle %llu\n",
+ llu(js_p->handle));
ds_attr = (&s_op->ds_attr);
gossip_debug(GOSSIP_MKDIR_DEBUG, " setting directory version to "
- "%Lu\n\tmtime is %Lu\n", Lu(ds_attr->mtime),
- Lu(PVFS_util_mkversion_time(ds_attr->mtime)));
+ "%llu\n\tmtime is %llu\n", llu(ds_attr->mtime),
+ llu(PVFS_util_mkversion_time(ds_attr->mtime)));
ret = job_trove_dspace_setattr(
s_op->u.mkdir.fs_id, s_op->resp.u.mkdir.handle,
@@ -213,9 +213,9 @@ static int mkdir_create_dirdata_dspace(
assert(extent_array.extent_count > 0);
gossip_debug(GOSSIP_MKDIR_DEBUG, " dirdata handle will "
- "be in starting hrange[0] %Lu-%Lu\n",
- Lu(extent_array.extent_array[0].first),
- Lu(extent_array.extent_array[0].last));
+ "be in starting hrange[0] %llu-%llu\n",
+ llu(extent_array.extent_array[0].first),
+ llu(extent_array.extent_array[0].last));
ret = job_trove_dspace_create(
s_op->u.mkdir.fs_id, &extent_array, PVFS_TYPE_DIRDATA, NULL,
@@ -247,8 +247,8 @@ static int mkdir_write_dirdata_handle(
s_op->u.mkdir.dirent_handle = js_p->handle;
- gossip_debug(GOSSIP_MKDIR_DEBUG, " *** new dirdata has handle %Lu\n",
- Lu(s_op->u.mkdir.dirent_handle));
+ gossip_debug(GOSSIP_MKDIR_DEBUG, " *** new dirdata has handle %llu\n",
+ llu(s_op->u.mkdir.dirent_handle));
s_op->key.buffer = Trove_Common_Keys[DIR_ENT_KEY].key;
s_op->key.buffer_sz = Trove_Common_Keys[DIR_ENT_KEY].size;
@@ -257,9 +257,9 @@ static int mkdir_write_dirdata_handle(
s_op->val.buffer_sz = sizeof(PVFS_handle);
gossip_debug(
- GOSSIP_MKDIR_DEBUG, " writing dirdata handle (%Lu) "
- "into parent dir (%Lu)\n", Lu(s_op->u.mkdir.dirent_handle),
- Lu(s_op->resp.u.mkdir.handle));
+ GOSSIP_MKDIR_DEBUG, " writing dirdata handle (%llu) "
+ "into parent dir (%llu)\n", llu(s_op->u.mkdir.dirent_handle),
+ llu(s_op->resp.u.mkdir.handle));
ret = job_trove_keyval_write(
s_op->u.mkdir.fs_id, s_op->resp.u.mkdir.handle,
Index: prelude.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/prelude.sm,v
diff -p -u -r1.55 -r1.56
--- prelude.sm 27 Oct 2005 18:43:10 -0000 1.55
+++ prelude.sm 10 Nov 2005 01:27:13 -0000 1.56
@@ -123,8 +123,8 @@ static int prelude_getattr_if_needed(
if (ret < 0)
{
gossip_debug(GOSSIP_SERVER_DEBUG, "PINT_req_sched_target_handle "
- "returned %d ret, skipping getattr on handle %Lu\n",
- ret, Lu(target_handle));
+ "returned %d ret, skipping getattr on handle %llu\n",
+ ret, llu(target_handle));
js_p->error_code = ret;
return 1;
@@ -146,7 +146,7 @@ static int prelude_getattr_if_needed(
memset(&(s_op->ds_attr), 0, sizeof(PVFS_ds_attributes));
gossip_debug(GOSSIP_SERVER_DEBUG, "About to retrieve attributes "
- "for handle %Lu\n", Lu(target_handle));
+ "for handle %llu\n", llu(target_handle));
ret = job_trove_dspace_getattr(
target_fs_id, target_handle, s_op, &(s_op->ds_attr),
Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.194 -r1.195
--- pvfs2-server.c 8 Nov 2005 16:29:24 -0000 1.194
+++ pvfs2-server.c 10 Nov 2005 01:27:13 -0000 1.195
@@ -395,8 +395,8 @@ int main(int argc, char **argv)
debug_mask = PVFS_debug_eventlog_to_mask(server_config.event_logging);
gossip_set_debug_mask(1, debug_mask);
gossip_set_logstamp(server_config.logstamp_type);
- gossip_debug(GOSSIP_SERVER_DEBUG,"Logging %s (mask %Lu)\n",
- server_config.event_logging, Lu(debug_mask));
+ gossip_debug(GOSSIP_SERVER_DEBUG,"Logging %s (mask %llu)\n",
+ server_config.event_logging, llu(debug_mask));
/* remove storage space and exit if requested */
if (s_server_options.server_remove_storage_space)
Index: pvfs2-server.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.h,v
diff -p -u -r1.123 -r1.124
--- pvfs2-server.h 27 Oct 2005 18:43:11 -0000 1.123
+++ pvfs2-server.h 10 Nov 2005 01:27:13 -0000 1.124
@@ -390,11 +390,11 @@ do {
__pw = getpwuid(__s_op->req->credentials.uid); \
__gr = getgrgid(__s_op->req->credentials.gid); \
snprintf(__pint_access_buffer, GOSSIP_BUF_SIZE, \
- "%s.%s@%s H=%Lu S=%p: %s: %s", \
+ "%s.%s@%s H=%llu S=%p: %s: %s", \
((__pw) ? __pw->pw_name : "UNKNOWN"), \
((__gr) ? __gr->gr_name : "UNKNOWN"), \
BMI_addr_rev_lookup_unexpected(__s_op->addr), \
- Lu(__handle), \
+ llu(__handle), \
__s_op, \
PINT_map_server_op_to_string(__s_op->req->op), \
format); \
Index: readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/readdir.sm,v
diff -p -u -r1.40 -r1.41
--- readdir.sm 27 Oct 2005 18:43:11 -0000 1.40
+++ readdir.sm 10 Nov 2005 01:27:13 -0000 1.41
@@ -4,7 +4,10 @@
* See COPYING in top-level directory.
*/
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include <string.h>
#include <assert.h>
@@ -100,9 +103,9 @@ static int readdir_verify_directory_meta
js_p->error_code = 0;
gossip_debug(GOSSIP_READDIR_DEBUG, " - attrs: owner=%d, group=%d, "
- "perms=%d\n\ttype=%d, mtime=%Lu\n", attr->owner,
+ "perms=%d\n\ttype=%d, mtime=%llu\n", attr->owner,
attr->group, attr->perms, attr->objtype,
- Lu(attr->mtime));
+ llu(attr->mtime));
if (attr->objtype != PVFS_TYPE_DIRECTORY)
{
@@ -131,9 +134,9 @@ static int readdir_read_dirdata_handle(
s_op->val.buffer_sz = sizeof(PVFS_handle);
gossip_debug(
- GOSSIP_READDIR_DEBUG, " - reading metadata: [%Lu,%d], "
+ GOSSIP_READDIR_DEBUG, " - reading metadata: [%llu,%d], "
"key=%s\n\t(sz=%d) val_buf=%p (sz=%d)\n",
- Lu(s_op->req->u.readdir.handle), s_op->req->u.readdir.fs_id,
+ llu(s_op->req->u.readdir.handle), s_op->req->u.readdir.fs_id,
(char *)s_op->key.buffer, s_op->key.buffer_sz,
s_op->val.buffer, s_op->val.buffer_sz);
@@ -210,9 +213,9 @@ static int readdir_iterate_on_entries(
}
gossip_debug(
- GOSSIP_READDIR_DEBUG, " - iterating keyvals: [%Lu,%d], "
+ GOSSIP_READDIR_DEBUG, " - iterating keyvals: [%llu,%d], "
"\n\ttoken=0x%x, count=%d\n",
- Lu(s_op->u.readdir.dirent_handle), s_op->req->u.readdir.fs_id,
+ llu(s_op->u.readdir.dirent_handle), s_op->req->u.readdir.fs_id,
s_op->req->u.readdir.token, s_op->req->u.readdir.dirent_count);
ret = job_trove_keyval_iterate(
Index: remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/remove.sm,v
diff -p -u -r1.41 -r1.42
--- remove.sm 15 Sep 2004 18:46:22 -0000 1.41
+++ remove.sm 10 Nov 2005 01:27:14 -0000 1.42
@@ -265,8 +265,8 @@ static int remove_read_dirdata_handle(PI
gossip_debug(GOSSIP_SERVER_DEBUG,
" trying to read dirdata handle (coll_id = %d, "
- "handle = %Lu, key = %s (%d), val_buf = %p (%d))\n",
- s_op->u.remove.fs_id, Lu(s_op->u.remove.handle),
+ "handle = %llu, key = %s (%d), val_buf = %p (%d))\n",
+ s_op->u.remove.fs_id, llu(s_op->u.remove.handle),
(char *)s_op->key.buffer, s_op->key.buffer_sz,
s_op->val.buffer, s_op->val.buffer_sz);
@@ -293,8 +293,8 @@ static int remove_getattr_of_dirdata_han
js_p->error_code = 0;
gossip_debug(GOSSIP_SERVER_DEBUG, " trying to getattr of "
- "dirdata handle (coll_id = %d, handle = %Lu\n",
- s_op->u.remove.fs_id, Lu(s_op->u.remove.handle));
+ "dirdata handle (coll_id = %d, handle = %llu\n",
+ s_op->u.remove.fs_id, llu(s_op->u.remove.handle));
ret = job_trove_dspace_getattr(
s_op->u.remove.fs_id, s_op->u.remove.dirdata_handle, s_op,
@@ -335,8 +335,8 @@ static int remove_remove_dirdata_dspace(
PINT_STATE_DEBUG("remove_dirdata_dspace");
gossip_debug(GOSSIP_SERVER_DEBUG,
- " removing dirdata dspace %Lu\n",
- Lu(s_op->u.remove.dirdata_handle));
+ " removing dirdata dspace %llu\n",
+ llu(s_op->u.remove.dirdata_handle));
ret = job_trove_dspace_remove(
s_op->u.remove.fs_id,
@@ -368,7 +368,7 @@ static int remove_remove_dspace(PINT_ser
PINT_STATE_DEBUG("remove_dspace");
gossip_debug(GOSSIP_SERVER_DEBUG, "(%p) remove: removing dspace "
- "object %Lu,%d\n", s_op, Lu(s_op->u.remove.handle),
+ "object %llu,%d\n", s_op, llu(s_op->u.remove.handle),
s_op->u.remove.fs_id);
ret = job_trove_dspace_remove(
Index: rmdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/rmdirent.sm,v
diff -p -u -r1.40 -r1.41
--- rmdirent.sm 27 Oct 2005 19:02:11 -0000 1.40
+++ rmdirent.sm 10 Nov 2005 01:27:14 -0000 1.41
@@ -150,10 +150,10 @@ static int rmdirent_verify_parent_metada
gossip_debug(
GOSSIP_SERVER_DEBUG,
- " reading dirdata handle (coll_id = 0x%x, handle = %Lu, "
+ " reading dirdata handle (coll_id = 0x%x, handle = %llu, "
"key = %s (%d), val_buf = %p (%d))\n",
s_op->req->u.rmdirent.fs_id,
- Lu(s_op->req->u.rmdirent.parent_handle),
+ llu(s_op->req->u.rmdirent.parent_handle),
(char *)s_op->key.buffer,
s_op->key.buffer_sz,
s_op->val.buffer,
@@ -190,8 +190,8 @@ static int rmdirent_read_directory_entry
PINT_STATE_DEBUG("read_directory_entry");
gossip_debug(GOSSIP_SERVER_DEBUG,
- " reading from dirent handle = %Lu, name = %s\n",
- Lu(s_op->u.rmdirent.dirdata_handle),
+ " reading from dirent handle = %llu, name = %s\n",
+ llu(s_op->u.rmdirent.dirdata_handle),
s_op->req->u.rmdirent.entry);
/* initialize keyval prior to read call
@@ -269,8 +269,8 @@ static int rmdirent_remove_directory_ent
s_op->key.buffer_sz = strlen(s_op->req->u.rmdirent.entry) + 1;
gossip_debug(GOSSIP_SERVER_DEBUG, " removing entry %s from dirdata "
- "object (handle = %Lu)\n", s_op->req->u.rmdirent.entry,
- Lu(s_op->u.rmdirent.dirdata_handle));
+ "object (handle = %llu)\n", s_op->req->u.rmdirent.entry,
+ llu(s_op->u.rmdirent.dirdata_handle));
ret = job_trove_keyval_remove(
s_op->req->u.rmdirent.fs_id, s_op->u.rmdirent.dirdata_handle,
@@ -336,9 +336,9 @@ static int rmdirent_update_directory_att
*/
gossip_debug(
GOSSIP_SERVER_DEBUG, "updating parent dir version "
- "to %Lu\n\tmtime is %Lu\n",
- Lu(PVFS_util_mktime_version(s_op->req->u.rmdirent.parent_mtime)),
- Lu(s_op->req->u.rmdirent.parent_mtime));
+ "to %llu\n\tmtime is %llu\n",
+ llu(PVFS_util_mktime_version(s_op->req->u.rmdirent.parent_mtime)),
+ llu(s_op->req->u.rmdirent.parent_mtime));
tmp_attr_ptr->mtime = PVFS_util_mktime_version(
s_op->req->u.rmdirent.parent_mtime);
@@ -410,8 +410,8 @@ static int rmdirent_setup_resp(PINT_serv
s_op->resp.u.rmdirent.entry_handle =
s_op->u.rmdirent.entry_handle;
gossip_debug(GOSSIP_SERVER_DEBUG,
- " succeeded; returning handle %Lu in response\n",
- Lu(s_op->resp.u.rmdirent.entry_handle));
+ " succeeded; returning handle %llu in response\n",
+ llu(s_op->resp.u.rmdirent.entry_handle));
}
else
{
Index: set-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/set-attr.sm,v
diff -p -u -r1.58 -r1.59
--- set-attr.sm 8 Nov 2005 16:50:47 -0000 1.58
+++ set-attr.sm 10 Nov 2005 01:27:14 -0000 1.59
@@ -130,9 +130,9 @@ static int setattr_verify_attribs(
if (a_p->objtype && req_a_p->objtype &&
(a_p->objtype != req_a_p->objtype))
{
- gossip_debug(GOSSIP_SETATTR_DEBUG, " handle %Lu is of type %d "
+ gossip_debug(GOSSIP_SETATTR_DEBUG, " handle %llu is of type %d "
"and cannot be changed to type %d\n",
- Lu(s_op->req->u.setattr.handle),
+ llu(s_op->req->u.setattr.handle),
a_p->objtype, s_op->req->u.setattr.attr.objtype);
/* set an error to bail out of set-attr processing */
@@ -154,8 +154,8 @@ static int setattr_verify_attribs(
(a_p->objtype == PVFS_TYPE_METAFILE))
{
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " handle %Lu refers to a metafile\n",
- Lu(s_op->req->u.setattr.handle));
+ " handle %llu refers to a metafile\n",
+ llu(s_op->req->u.setattr.handle));
gossip_debug(
GOSSIP_SETATTR_DEBUG, " *** dspace has dfile count %d and "
@@ -202,22 +202,22 @@ static int setattr_verify_attribs(
(a_p->objtype == PVFS_TYPE_DATAFILE))
{
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " handle %Lu refers to a datafile\n",
- Lu(s_op->req->u.setattr.handle));
+ " handle %llu refers to a datafile\n",
+ llu(s_op->req->u.setattr.handle));
}
else if ((req_a_p->objtype == PVFS_TYPE_DIRECTORY) ||
(a_p->objtype == PVFS_TYPE_DIRECTORY))
{
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " handle %Lu refers to a directory\n",
- Lu(s_op->req->u.setattr.handle));
+ " handle %llu refers to a directory\n",
+ llu(s_op->req->u.setattr.handle));
}
else if ((req_a_p->objtype == PVFS_TYPE_SYMLINK) ||
(a_p->objtype == PVFS_TYPE_SYMLINK))
{
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " handle %Lu refers to a symlink\n",
- Lu(s_op->req->u.setattr.handle));
+ " handle %llu refers to a symlink\n",
+ llu(s_op->req->u.setattr.handle));
if (req_a_p->mask & PVFS_ATTR_SYMLNK_ALL)
{
@@ -225,8 +225,8 @@ static int setattr_verify_attribs(
assert(req_a_p->u.sym.target_path);
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " symlink links handle %Lu to %s\n",
- Lu(s_op->req->u.setattr.handle),
+ " symlink links handle %llu to %s\n",
+ llu(s_op->req->u.setattr.handle),
req_a_p->u.sym.target_path);
a_p->u.sym.target_path_len = req_a_p->u.sym.target_path_len;
@@ -238,14 +238,14 @@ static int setattr_verify_attribs(
(a_p->objtype == PVFS_TYPE_DIRDATA))
{
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " handle %Lu refers to a dirdata object\n",
- Lu(s_op->req->u.setattr.handle));
+ " handle %llu refers to a dirdata object\n",
+ llu(s_op->req->u.setattr.handle));
}
else
{
gossip_debug(GOSSIP_SETATTR_DEBUG,
- " handle %Lu refers to something unknown\n",
- Lu(s_op->req->u.setattr.handle));
+ " handle %llu refers to something unknown\n",
+ llu(s_op->req->u.setattr.handle));
js_p->error_code = -PVFS_EACCES;
}
@@ -286,8 +286,8 @@ static int setattr_setobj_attribs(PINT_s
PVFS_time orig_mtime = a_p->mtime;
a_p->mtime = PVFS_util_mktime_version(orig_mtime);
gossip_debug(GOSSIP_SETATTR_DEBUG, "setting version "
- "to %Lu\n\tmtime is %Lu\n",
- Lu(a_p->mtime), Lu(orig_mtime));
+ "to %llu\n\tmtime is %llu\n",
+ llu(a_p->mtime), llu(orig_mtime));
}
/* if the object is a symbolic link, check to make sure that the request
@@ -313,11 +313,11 @@ static int setattr_setobj_attribs(PINT_s
gossip_debug(
GOSSIP_SETATTR_DEBUG,
" WRITING attrs: [owner = %d, group = %d\n\t"
- "perms = %o, type = %d, atime = %Lu, mtime = %Lu\n\t"
- "ctime = %Lu | dfile_count = %d | dist_size = %d]\n",
+ "perms = %o, type = %d, atime = %llu, mtime = %llu\n\t"
+ "ctime = %llu | dfile_count = %d | dist_size = %d]\n",
dspace_a_p->owner, dspace_a_p->group, dspace_a_p->perms,
- dspace_a_p->objtype, Lu(dspace_a_p->atime),
- Lu(PVFS_util_mkversion_time(dspace_a_p->mtime)), Lu(dspace_a_p->ctime),
+ dspace_a_p->objtype, llu(dspace_a_p->atime),
+ llu(PVFS_util_mkversion_time(dspace_a_p->mtime)), llu(dspace_a_p->ctime),
(int)dspace_a_p->u.meta.dfile_count,
(int)dspace_a_p->u.meta.dist_size);
@@ -370,9 +370,9 @@ static int setattr_write_metafile_datafi
s_op->val.buffer_sz = dfile_count * sizeof(PVFS_handle);
gossip_debug(
- GOSSIP_SETATTR_DEBUG, " writing %s [%Lu,%d,"
+ GOSSIP_SETATTR_DEBUG, " writing %s [%llu,%d,"
"len %d]\n", (char *)s_op->key.buffer,
- Lu(s_op->req->u.setattr.handle), s_op->req->u.setattr.fs_id,
+ llu(s_op->req->u.setattr.handle), s_op->req->u.setattr.fs_id,
s_op->val.buffer_sz);
ret = job_trove_keyval_write(
@@ -420,9 +420,9 @@ static int setattr_write_metafile_distri
PINT_dist_encode(NULL, s_op->req->u.setattr.attr.u.meta.dist);
gossip_debug(
- GOSSIP_SERVER_DEBUG, " writing %s [%Lu,%d,"
+ GOSSIP_SERVER_DEBUG, " writing %s [%llu,%d,"
"len %d]\n", (char *)s_op->key.buffer,
- Lu(s_op->req->u.setattr.handle), s_op->req->u.setattr.fs_id,
+ llu(s_op->req->u.setattr.handle), s_op->req->u.setattr.fs_id,
s_op->val.buffer_sz);
ret = job_trove_keyval_write(
@@ -467,9 +467,9 @@ static int setattr_write_symlink_target_
s_op->val.buffer = s_op->req->u.setattr.attr.u.sym.target_path;
s_op->val.buffer_sz = s_op->req->u.setattr.attr.u.sym.target_path_len;
- gossip_debug(GOSSIP_SETATTR_DEBUG, " writing %s [%Lu,%d,"
+ gossip_debug(GOSSIP_SETATTR_DEBUG, " writing %s [%llu,%d,"
"len %d]\n", (char *)s_op->key.buffer,
- Lu(s_op->req->u.setattr.handle),
+ llu(s_op->req->u.setattr.handle),
s_op->req->u.setattr.fs_id,
s_op->val.buffer_sz);
Index: set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/set-eattr.sm,v
diff -p -u -r1.3 -r1.4
--- set-eattr.sm 1 Aug 2005 22:49:52 -0000 1.3
+++ set-eattr.sm 10 Nov 2005 01:27:14 -0000 1.4
@@ -110,9 +110,9 @@ static int seteattr_verify_eattribs(
js_p->error_code = 0;
gossip_debug(GOSSIP_SETEATTR_DEBUG,
- " ext attr list write to handle %Lu refers to a %s\n\t"
+ " ext attr list write to handle %llu refers to a %s\n\t"
"[owner = %d, group = %d, perms = %o, type = %d]\n",
- Lu(s_op->req->u.seteattr.handle),
+ llu(s_op->req->u.seteattr.handle),
get_object_type(a_p->objtype),
a_p->owner, a_p->group, a_p->perms, a_p->objtype);
@@ -197,8 +197,8 @@ static int seteattr_setobj_eattribs(
gossip_debug(
GOSSIP_SETEATTR_DEBUG,
- " writing keylist [%Lu,%d,len %d flags %d]\n",
- Lu(s_op->req->u.seteattr.handle),
+ " writing keylist [%llu,%d,len %d flags %d]\n",
+ llu(s_op->req->u.seteattr.handle),
s_op->req->u.seteattr.fs_id,
s_op->req->u.seteattr.nkey, s_op->req->u.seteattr.flags);
Index: setparam.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/setparam.sm,v
diff -p -u -r1.25 -r1.26
--- setparam.sm 7 Oct 2005 19:32:46 -0000 1.25
+++ setparam.sm 10 Nov 2005 01:27:14 -0000 1.26
@@ -98,7 +98,7 @@ static int setparam_work(PINT_server_op
tmp_handle = (PVFS_handle)s_op->req->u.mgmt_setparam.value;
s_op->resp.u.mgmt_setparam.old_value = 0;
gossip_debug(GOSSIP_SERVER_DEBUG, " - ROOT_CHECK looking for"
- " handle %Lu, on fs_id %d\n", Lu(tmp_handle),
+ " handle %llu, on fs_id %d\n", llu(tmp_handle),
s_op->req->u.mgmt_setparam.fs_id);
ret = job_trove_dspace_verify(
s_op->req->u.mgmt_setparam.fs_id, tmp_handle,
More information about the PVFS2-CVS
mailing list