[PVFS2-CVS]
commit by slang in pvfs2/src/server: crdirent.sm del-eattr.sm
get-attr.sm get-eattr.sm io.sm rmdirent.sm set-eattr.sm setparam.sm
CVS commit program
cvs at parl.clemson.edu
Thu Aug 25 19:14:30 EDT 2005
Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb:/tmp/cvs-serv8981/src/server
Modified Files:
Tag: slang-event-changes-branch
crdirent.sm del-eattr.sm get-attr.sm get-eattr.sm io.sm
rmdirent.sm set-eattr.sm setparam.sm
Log Message:
fixes after branch point shift
Index: crdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/crdirent.sm,v
diff -p -u -r1.51.6.2 -r1.51.6.3
--- crdirent.sm 25 Aug 2005 20:38:37 -0000 1.51.6.2
+++ crdirent.sm 25 Aug 2005 22:14:29 -0000 1.51.6.3
@@ -658,7 +658,6 @@ static int crdirent_set_error_code(
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));
Index: del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/del-eattr.sm,v
diff -p -u -r1.2.6.1 -r1.2.6.2
--- del-eattr.sm 25 Aug 2005 20:38:37 -0000 1.2.6.1
+++ del-eattr.sm 25 Aug 2005 22:14:29 -0000 1.2.6.2
@@ -101,8 +101,6 @@ static int deleattr_verify_eattribs(
{
PVFS_object_attr *a_p = NULL;
- PINT_STATE_DEBUG("verify_eattribs");
-
a_p = &s_op->attr;
js_p->error_code = 0;
@@ -174,8 +172,6 @@ static int deleattr_delobj_eattribs(PINT
job_id_t j_id;
struct server_configuration_s *user_opts = get_server_config_struct();
- PINT_STATE_DEBUG("seteattr_setobj_eattribs");
-
/* set up key and value structure for keyval write */
s_op->key.buffer = s_op->req->u.deleattr.key.buffer;
s_op->key.buffer_sz = s_op->req->u.deleattr.key.buffer_sz;
@@ -222,8 +218,6 @@ static int deleattr_delobj_eattribs(PINT
*/
static int deleattr_cleanup(PINT_server_op *s_op, job_status_s *js_p)
{
- PINT_STATE_DEBUG("deleattr_cleanup");
-
gossip_debug(
GOSSIP_DELEATTR_DEBUG,
"keybuf %p keylen %d\n",
Index: get-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-attr.sm,v
diff -p -u -r1.67.6.2 -r1.67.6.3
--- get-attr.sm 25 Aug 2005 20:38:37 -0000 1.67.6.2
+++ get-attr.sm 25 Aug 2005 22:14:29 -0000 1.67.6.3
@@ -719,8 +719,6 @@ static int getattr_read_dirdata_if_requi
int ret = -PVFS_EINVAL;
job_id_t i;
- PINT_STATE_DEBUG("read_dirdata_if_required");
-
s_op->key.buffer = Trove_Common_Keys[DIR_ENT_KEY].key;
s_op->key.buffer_sz = Trove_Common_Keys[DIR_ENT_KEY].size;
@@ -741,8 +739,6 @@ static int getattr_get_dirent_count(
int ret;
job_id_t tmp_id;
- 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));
@@ -758,8 +754,6 @@ static int getattr_get_dirent_count(
static int getattr_interpret_dirent_count(
PINT_server_op *s_op, job_status_s *js_p)
{
- PINT_STATE_DEBUG("interpret_dirent_count");
-
s_op->resp.u.getattr.attr.u.dir.dirent_count =
s_op->u.getattr.dirdata_ds_attr.k_size;
Index: get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-eattr.sm,v
diff -p -u -r1.3.4.1 -r1.3.4.2
--- get-eattr.sm 25 Aug 2005 20:38:37 -0000 1.3.4.1
+++ get-eattr.sm 25 Aug 2005 22:14:29 -0000 1.3.4.2
@@ -120,7 +120,6 @@ machine pvfs2_get_eattr_sm(
static int geteattr_setup_resp(PINT_server_op *s_op, job_status_s *js_p)
{
int i, tsz;
- PINT_STATE_DEBUG("setup_resp");
gossip_debug(GOSSIP_GETEATTR_DEBUG,"geteattr requesting %d keys\n",
s_op->req->u.geteattr.nkey);
s_op->resp.u.geteattr.val =
@@ -160,8 +159,6 @@ static int geteattr_read_eattrib(
int ret = -PVFS_EINVAL;
job_id_t i;
- PINT_STATE_DEBUG("read_eattrib");
-
js_p->error_code = 0;
ret = job_trove_keyval_read_list(
@@ -188,7 +185,6 @@ static int geteattr_read_eattrib(
static int geteattr_check_resp(PINT_server_op *s_op, job_status_s *js_p)
{
int k;
- PINT_STATE_DEBUG("check_resp");
gossip_debug(GOSSIP_GETEATTR_DEBUG,"geteattr returning %d values\n",
s_op->resp.u.geteattr.nkey);
/* put the returned read buffer size in buffer_sz */
@@ -215,7 +211,6 @@ static int geteattr_check_resp(PINT_serv
*/
static int geteattr_cleanup(PINT_server_op *s_op, job_status_s *js_p)
{
- PINT_STATE_DEBUG("geteattr_cleanup");
if (s_op->resp.u.geteattr.val)
free(s_op->resp.u.geteattr.val);
if (s_op->u.eattr.buffer)
Index: io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/io.sm,v
diff -p -u -r1.55.6.2 -r1.55.6.3
--- io.sm 25 Aug 2005 20:38:37 -0000 1.55.6.2
+++ io.sm 25 Aug 2005 22:14:29 -0000 1.55.6.3
@@ -299,8 +299,6 @@ static int io_cleanup(PINT_server_op *s_
{
char status_string[64] = {0};
- PINT_STATE_DEBUG("cleanup");
-
PVFS_strerror_r(s_op->resp.status, status_string, 64);
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "finish (%s)\n", status_string);
Index: rmdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/rmdirent.sm,v
diff -p -u -r1.38.6.2 -r1.38.6.3
--- rmdirent.sm 25 Aug 2005 20:38:38 -0000 1.38.6.2
+++ rmdirent.sm 25 Aug 2005 22:14:29 -0000 1.38.6.3
@@ -133,8 +133,6 @@ static int rmdirent_verify_parent_metada
int ret = -PVFS_EINVAL;
job_id_t i;
- PINT_STATE_DEBUG("verify_parent_metadata_and_"
- "read_directory_entry_handle");
PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "rmdirent entry: %s\n",
s_op->req->u.rmdirent.entry);
Index: set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/set-eattr.sm,v
diff -p -u -r1.3.4.1 -r1.3.4.2
--- set-eattr.sm 25 Aug 2005 20:38:38 -0000 1.3.4.1
+++ set-eattr.sm 25 Aug 2005 22:14:30 -0000 1.3.4.2
@@ -103,8 +103,6 @@ static int seteattr_verify_eattribs(
PVFS_object_attr *a_p = NULL;
int i;
- PINT_STATE_DEBUG("verify_eattribs");
-
a_p = &s_op->attr;
js_p->error_code = 0;
@@ -193,8 +191,6 @@ static int seteattr_setobj_eattribs(
job_id_t j_id;
struct server_configuration_s *user_opts = get_server_config_struct();
- PINT_STATE_DEBUG("seteattr_setobj_eattribs");
-
gossip_debug(
GOSSIP_SETEATTR_DEBUG,
" writing keylist [%Lu,%d,len %d flags %d]\n",
@@ -242,7 +238,6 @@ static int seteattr_setobj_eattribs(
*/
static int seteattr_cleanup(PINT_server_op *s_op, job_status_s *js_p)
{
- PINT_STATE_DEBUG("seteattr_cleanup");
/* do I need to free memory from decoding key and val?*/
return(server_state_machine_complete(s_op));
}
Index: setparam.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/setparam.sm,v
diff -p -u -r1.22.6.2 -r1.22.6.3
--- setparam.sm 25 Aug 2005 20:38:38 -0000 1.22.6.2
+++ setparam.sm 25 Aug 2005 22:14:30 -0000 1.22.6.3
@@ -73,8 +73,6 @@ static int setparam_work(PINT_server_op
struct filesystem_configuration_s *fs_conf;
char buf[16] = {0};
- PINT_STATE_DEBUG("work");
-
switch(s_op->req->u.mgmt_setparam.param)
{
case PVFS_SERV_PARAM_GOSSIP_MASK:
More information about the PVFS2-CVS
mailing list