Index: /branches/Orange-Elaine-Distr-Dir-Branch/src/server/set-attr.sm
===================================================================
--- /branches/Orange-Elaine-Distr-Dir-Branch/src/server/set-attr.sm	(revision 8544)
+++ /branches/Orange-Elaine-Distr-Dir-Branch/src/server/set-attr.sm	(revision 8768)
@@ -296,4 +296,5 @@
             memcpy(a_p->u.dir.dirdata_handles, req_a_p->u.dir.dirdata_handles,
                 a_p->u.dir.dist_dir_attr.num_servers * sizeof(PVFS_handle));
+            js_p->error_code = STATE_DIRDATA;
         }
         else
@@ -511,5 +512,5 @@
     int i;
 
-    /* reset from jump to here with STATE_METAFILE */
+    /* reset from jump to here with STATE_DIRDATA */
     js_p->error_code = 0;
 
Index: /branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/mkspace.c
===================================================================
--- /branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/mkspace.c	(revision 8760)
+++ /branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/mkspace.c	(revision 8768)
@@ -427,5 +427,4 @@
         s_used_handles[1] = root_dirdata_handle;
 
-#if 0
         /* set root dirdata dspace attributes */
         memset(&attr, 0, sizeof(TROVE_ds_attributes_s));
@@ -454,5 +453,4 @@
             return -1;
         }
-#endif
 
 
@@ -598,5 +596,4 @@
         }
 
-#if 0
         /* adjust dist_dir_attr val_a */
         val_a[0].buffer = &dirdata_dist_dir_attr;
@@ -631,5 +628,5 @@
         mkspace_print(
             verbose, "info: wrote attributes for root directory.\n");
-#endif
+
 
         /****************************************************
@@ -757,5 +754,4 @@
         s_used_handles[3] = lost_and_found_dirdata_handle;
 
-#if 0
         /* set lost+found dirdata dspace attributes */
         memset(&attr, 0, sizeof(TROVE_ds_attributes_s));
@@ -784,5 +780,4 @@
             return -1;
         }
-#endif
 
         key.buffer = DIRECTORY_ENTRY_KEYSTR;
@@ -850,5 +845,5 @@
         }
 
-#if 0
+
         /* adjust dist_dir_attr val */
         val_a[0].buffer = &dirdata_dist_dir_attr;
@@ -883,5 +878,5 @@
         mkspace_print(verbose, "info: wrote attributes for "
                       "lost+found directory.\n");
-#endif
+
 
         /*