Changeset 8418 for branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-remove.sm

Timestamp:

06/29/10 12:53:16 (3 years ago)

Author:

elaine

Message:

Pass multiple dirent handles between server and client.

Files:

• branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-remove.sm (modified) (6 diffs)

branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-remove.sm

@@ -16 +16 @@
 
 #include "client-state-machine.h"
+#include "pint-util.h"
 #include "pvfs2-debug.h"
 #include "job.h"
@@ -299 +300 @@
     msg_p = &sm_p->msgarray_op.msgpair;
 
+    /* TODO: Need to find the correct dirent_handle */
     PINT_SERVREQ_RMDIRENT_FILL(
         msg_p->req,
@@ -304 +306 @@
         sm_p->parent_ref.fs_id,
         sm_p->parent_ref.handle,
-        sm_p->getattr.attr.u.dir.dirent_handle,
+        sm_p->getattr.attr.u.dir.dirent_handle[0],
         sm_p->u.remove.object_name,
         sm_p->hints);
@@ -370 +372 @@
     assert(attr);
 
+    /* TODO: Need to find the correct dirent_handle */
     gossip_debug(GOSSIP_CLIENT_DEBUG, "dirent_handle: %llu\n",
-        llu(attr->u.dir.dirent_handle));
+        llu(attr->u.dir.dirent_handle[0]));
  
     PINT_msgpair_init(&sm_p->msgarray_op);
@@ -382 +385 @@
         sm_p->object_ref.handle,
         sm_p->parent_ref.handle,
-        attr->u.dir.dirent_handle,
+        attr->u.dir.dirent_handle[0],
         sm_p->parent_ref.fs_id,
         sm_p->hints);
@@ -501 +504 @@
 
     PINT_msgpairarray_destroy(&sm_p->msgarray_op);
+    PINT_SM_GETATTR_STATE_CLEAR(sm_p->getattr);
 
     PINT_SET_OP_COMPLETE;