Changeset 8495

Timestamp:

09/06/10 17:30:02 (3 years ago)

Author:

elaine

Message:

Partial fix to lookup problems.

Location:

branches/Orange-Elaine-Distr-Dir-Branch/src/server

Files:

• lookup.sm (modified) (3 diffs)
• pvfs2-server.h (modified) (1 diff)

branches/Orange-Elaine-Distr-Dir-Branch/src/server/lookup.sm

@@ -642 +642 @@
         sizeof(PVFS_handle);
 
+    s_op->u.lookup.err_array = (PVFS_error*)calloc(keyval_count,
+        sizeof(PVFS_error));
+    if (s_op->u.lookup.err_array == NULL)
+    {
+        js_p->error_code = -PVFS_ENOMEM;
+        return SM_ACTION_COMPLETE;
+    }
+
     js_p->error_code = 0;
     ret = job_trove_keyval_read_list(
-        s_op->u.getattr.fs_id, s_op->u.getattr.handle,
+        s_op->req->u.lookup_path.fs_id, handle,
         s_op->key_a, s_op->val_a,
-        s_op->u.getattr.err_array,
+        s_op->u.lookup.err_array,
         keyval_count,
         0,
@@ -691 +699 @@
     s_op->u.lookup.seg_nr++;
 
+    /* TODO: Decide which dirdata_handle is correct. Do server-to-server
+       communication if necessary to read the entry. */
     ret = job_trove_keyval_read(
         s_op->req->u.lookup_path.fs_id, s_op->u.lookup.attr.u.dir.dirdata_handles[0],
@@ -787 +797 @@
     }
 
+    if (s_op->u.lookup.err_array)
+    {
+        free(s_op->u.lookup.err_array);
+        s_op->u.lookup.err_array = NULL;
+    }
+
     /* TODO: Need to free bitmap and handles arrays. */
 

branches/Orange-Elaine-Distr-Dir-Branch/src/server/pvfs2-server.h

@@ -409 +409 @@
     PVFS_ds_attributes *ds_attr_array;
     PVFS_object_attr attr;
+
+    PVFS_error* err_array;
 };