Changeset 8397 for branches/cu-security-branch/src/server/remove.sm

Timestamp:

06/18/10 20:02:50 (3 years ago)

Author:

nlmills

Message:

initial merge with Orange-Branch. much will be broken

Location:

branches/cu-security-branch

Files:

• . (modified) (1 prop)
• src/server (modified) (1 prop)
• src/server/remove.sm (modified) (7 diffs)

branches/cu-security-branch

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

branches/cu-security-branch/src/server/remove.sm

@@ -117 +117 @@
 }
 
+nested machine pvfs2_remove_with_prelude_sm
+{
+    state prelude
+    {
+        jump pvfs2_prelude_sm;
+        success => do_work;
+        default => return;
+    }
+
+    state do_work
+    {
+        jump pvfs2_remove_work_sm;
+        default => return;
+    }
+}
+
 machine pvfs2_remove_sm
 {
-    state prelude
-    {
-        jump pvfs2_prelude_sm;
-        success => setup_work;
-        default => final_response;
-    }
-
-    state setup_work
-    {   
-        run remove_setup_work;
-        default => work;
-    }
-
     state work
     {
-        jump pvfs2_remove_work_sm;
+        jump pvfs2_remove_with_prelude_sm;
         default => final_response;
     }
@@ -237 +240 @@
                  "  trying to read dirdata handle (coll_id = %d, "
                  "handle = %llu, key = %s (%d), val_buf = %p (%d))\n",
-                 s_op->u.remove.fs_id, llu(s_op->u.remove.handle),
+                 s_op->req->u.remove.fs_id, llu(s_op->req->u.remove.handle),
                  (char *)s_op->key.buffer, s_op->key.buffer_sz,
                  s_op->val.buffer, s_op->val.buffer_sz);
 
     ret = job_trove_keyval_read(
-        s_op->u.remove.fs_id, s_op->u.remove.handle,
+        s_op->req->u.remove.fs_id, s_op->req->u.remove.handle,
         &s_op->key, &s_op->val,
         0,
@@ -266 +269 @@
 
     ret = job_trove_keyval_iterate_keys(
-        s_op->u.remove.fs_id,
+        s_op->req->u.remove.fs_id,
         s_op->u.remove.dirdata_handle,
         PVFS_ITERATE_START,
@@ -295 +298 @@
                          "directory (fsid: %u, handle: %llu) "
                          "-- returning error\n",
-                         s_op->u.remove.fs_id,
-                         llu(s_op->u.remove.handle));
+                         s_op->req->u.remove.fs_id,
+                         llu(s_op->req->u.remove.handle));
             js_p->error_code = -PVFS_ENOTEMPTY;
         }
@@ -327 +330 @@
 
     ret = job_trove_dspace_remove(
-        s_op->u.remove.fs_id,
+        s_op->req->u.remove.fs_id,
         s_op->u.remove.dirdata_handle,
         0,  /* don't sync here, we do a dspace remove on the dir handle next */
@@ -352 +355 @@
     job_id_t j_id;
     gossip_debug(GOSSIP_SERVER_DEBUG, "(%p) remove: removing dspace "
-                 "object %llu,%d\n", s_op, llu(s_op->u.remove.handle),
-                 s_op->u.remove.fs_id);
+                 "object %llu,%d\n", s_op, llu(s_op->req->u.remove.handle),
+                 s_op->req->u.remove.fs_id);
 
     ret = job_trove_dspace_remove(
-        s_op->u.remove.fs_id, s_op->u.remove.handle,
+        s_op->req->u.remove.fs_id, s_op->req->u.remove.handle,
         TROVE_SYNC,
         smcb, 0, js_p,
@@ -374 +377 @@
 {
     return(server_state_machine_complete(smcb));
-}
-
-static PINT_sm_action remove_setup_work(
-        struct PINT_smcb *smcb, job_status_s *js_p)
-{
-    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    s_op->u.remove.handle = s_op->req->u.remove.handle;
-    s_op->u.remove.fs_id = s_op->req->u.remove.fs_id;
-    js_p->error_code = 0;
-    return SM_ACTION_COMPLETE;
 }
 

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk