[Pvfs2-cvs] commit by dbonnie in pvfs2/src/client/sysint:
client-state-machine.c server-get-config.sm sys-symlink.sm
CVS commit program
cvs at parl.clemson.edu
Thu May 22 14:24:02 EDT 2008
Update of /anoncvs/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv11243/src/client/sysint
Modified Files:
Tag: cu-security-branch
client-state-machine.c server-get-config.sm sys-symlink.sm
Log Message:
Patch from HEAD and fixed a bug in pvfs2-genconfig script.
Index: client-state-machine.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.94.2.1 -r1.94.2.2
--- client-state-machine.c 16 May 2008 15:15:30 -0000 1.94.2.1
+++ client-state-machine.c 22 May 2008 18:24:02 -0000 1.94.2.2
@@ -760,7 +760,6 @@ PVFS_error PINT_client_wait_internal(
{
smcb = PINT_id_gen_safe_lookup(op_id);
assert(smcb);
- sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
do
{
@@ -772,6 +771,8 @@ PVFS_error PINT_client_wait_internal(
ret = PINT_client_state_machine_test(op_id, out_error);
} while (!PINT_smcb_complete(smcb) && (ret == 0));
+
+ sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
if (ret)
{
Index: server-get-config.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.31.2.2 -r1.31.2.3
--- server-get-config.sm 16 May 2008 16:06:54 -0000 1.31.2.2
+++ server-get-config.sm 22 May 2008 18:24:02 -0000 1.31.2.3
@@ -266,7 +266,6 @@ static PINT_sm_action server_get_config_
msg_p->enc_type = sm_p->u.get_config.mntent->encoding;
}
-
ret = BMI_addr_lookup(&serv_addr,
sm_p->u.get_config.mntent->the_pvfs_config_server);
if (ret < 0)
Index: sys-symlink.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.71.2.1 -r1.71.2.2
--- sys-symlink.sm 16 May 2008 15:15:32 -0000 1.71.2.1
+++ sys-symlink.sm 22 May 2008 18:24:02 -0000 1.71.2.2
@@ -408,6 +408,7 @@ static PINT_sm_action symlink_crdirent_s
gossip_debug(GOSSIP_CLIENT_DEBUG," symlink: posting crdirent req\n");
PINT_msgpair_init(&sm_p->msgarray_op);
+ msg_p = &sm_p->msgarray_op.msgpair;
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
@@ -458,6 +459,7 @@ static PINT_sm_action symlink_setattr_se
gossip_debug(GOSSIP_CLIENT_DEBUG," symlink: posting setattr req\n");
PINT_msgpair_init(&sm_p->msgarray_op);
+ msg_p = &sm_p->msgarray_op.msgpair;
/* force permissions to 777 for symbolic links */
sm_p->u.sym.sys_attr.perms = 0777;
@@ -516,6 +518,7 @@ static PINT_sm_action symlink_delete_han
js_p->error_code = 0;
PINT_msgpair_init(&sm_p->msgarray_op);
+ msg_p = &sm_p->msgarray_op.msgpair;
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
More information about the Pvfs2-cvs
mailing list