Version before multiple cid changes

SNSL · Nov 15, 2012 · 60ef726 · 60ef726
1 parent ce518ea
commit 60ef726
Show file tree

Hide file tree

Showing 1,068 changed files with 370 additions and 211 deletions.
diff --git a/.cvsignore b/.cvsignore
diff --git a/AUTHORS b/AUTHORS
diff --git a/COPYING b/COPYING
diff --git a/CREDITS b/CREDITS
diff --git a/ChangeLog b/ChangeLog
diff --git a/INSTALL b/INSTALL
diff --git a/Makefile.in b/Makefile.in
diff --git a/PVFS2-GLOBAL-TODO.txt b/PVFS2-GLOBAL-TODO.txt
diff --git a/README b/README
diff --git a/README.name_change b/README.name_change
diff --git a/README.osd b/README.osd
diff --git a/config.save b/config.save
@@ -525,7 +525,7 @@ s,@ECHO_C@,,;t t
 s,@ECHO_N@,-n,;t t
 s,@ECHO_T@,,;t t
 s,@LIBS@, -lcrypto -lssl -ldl,;t t
-s,@PVFS2_VERSION@,2.8.6-orangefs-2012-10-11-115608,;t t
+s,@PVFS2_VERSION@,2.8.6-orangefs-2012-11-15-124111,;t t
 s,@PVFS2_VERSION_MAJOR@,2,;t t
 s,@PVFS2_VERSION_MINOR@,8,;t t
 s,@PVFS2_VERSION_SUB@,6,;t t

diff --git a/configure.in b/configure.in
diff --git a/doc/.cvsignore b/doc/.cvsignore
diff --git a/doc/REFERENCES b/doc/REFERENCES
diff --git a/doc/REFERENCES.bib b/doc/REFERENCES.bib
diff --git a/doc/add-client-syscall b/doc/add-client-syscall
diff --git a/doc/add-server-req b/doc/add-server-req
diff --git a/doc/basics.tex b/doc/basics.tex
diff --git a/doc/code-tree.tex b/doc/code-tree.tex
diff --git a/doc/coding/backtrace_analysis.txt b/doc/coding/backtrace_analysis.txt
diff --git a/doc/coding/module.mk.in b/doc/coding/module.mk.in
diff --git a/doc/coding/romio-MPICH2-0.96p2-PVFS2-0.51.diff b/doc/coding/romio-MPICH2-0.96p2-PVFS2-0.51.diff
diff --git a/doc/coding/valgrind b/doc/coding/valgrind
diff --git a/doc/db-recovery.txt b/doc/db-recovery.txt
diff --git a/doc/design/bmi-design.tex b/doc/design/bmi-design.tex
diff --git a/doc/design/concepts.tex b/doc/design/concepts.tex
diff --git a/doc/design/distributions.tex b/doc/design/distributions.tex
diff --git a/doc/design/figs/arrayFig.eps b/doc/design/figs/arrayFig.eps
diff --git a/doc/design/figs/bmi-arch-color.eps b/doc/design/figs/bmi-arch-color.eps
diff --git a/doc/design/figs/bmi-arch-color.fig b/doc/design/figs/bmi-arch-color.fig
diff --git a/doc/design/figs/core-sm.eps b/doc/design/figs/core-sm.eps
diff --git a/doc/design/figs/figs_atoc.eps b/doc/design/figs/figs_atoc.eps
diff --git a/doc/design/figs/figs_atoc.fig b/doc/design/figs/figs_atoc.fig
diff --git a/doc/design/figs/figs_dtoe.eps b/doc/design/figs/figs_dtoe.eps
diff --git a/doc/design/figs/figs_dtoe.fig b/doc/design/figs/figs_dtoe.fig
diff --git a/doc/design/figs/flow-arch.eps b/doc/design/figs/flow-arch.eps
diff --git a/doc/design/figs/flow-arch.fig b/doc/design/figs/flow-arch.fig
diff --git a/doc/design/figs/get_configArrayLayout.eps b/doc/design/figs/get_configArrayLayout.eps
diff --git a/doc/design/figs/getconfiginit.eps b/doc/design/figs/getconfiginit.eps
diff --git a/doc/design/figs/getconfigservop.eps b/doc/design/figs/getconfigservop.eps
diff --git a/doc/design/figs/handle_jobs.eps b/doc/design/figs/handle_jobs.eps
diff --git a/doc/design/figs/handle_jobs.graph b/doc/design/figs/handle_jobs.graph
diff --git a/doc/design/figs/interface-model.eps b/doc/design/figs/interface-model.eps
diff --git a/doc/design/figs/interface-model5.fig b/doc/design/figs/interface-model5.fig
diff --git a/doc/design/figs/io_op-protocol.eps b/doc/design/figs/io_op-protocol.eps
diff --git a/doc/design/figs/io_op-protocol.fig b/doc/design/figs/io_op-protocol.fig
diff --git a/doc/design/figs/job-group.eps b/doc/design/figs/job-group.eps
diff --git a/doc/design/figs/job-group.fig b/doc/design/figs/job-group.fig
diff --git a/doc/design/figs/lookup.eps b/doc/design/figs/lookup.eps
diff --git a/doc/design/figs/lookup.graph b/doc/design/figs/lookup.graph
diff --git a/doc/design/figs/pvfs2-vfs.eps b/doc/design/figs/pvfs2-vfs.eps
diff --git a/doc/design/figs/setmeta-protocol.eps b/doc/design/figs/setmeta-protocol.eps
diff --git a/doc/design/figs/setmeta-protocol.fig b/doc/design/figs/setmeta-protocol.fig
diff --git a/doc/design/figs/simpleState.eps b/doc/design/figs/simpleState.eps
diff --git a/doc/design/figs/stateExec2.eps b/doc/design/figs/stateExec2.eps
diff --git a/doc/design/flow-design.tex b/doc/design/flow-design.tex
diff --git a/doc/design/fs-semantics.tex b/doc/design/fs-semantics.tex
diff --git a/doc/design/handle-allocator.tex b/doc/design/handle-allocator.tex
diff --git a/doc/design/module.mk.in b/doc/design/module.mk.in
diff --git a/doc/design/new_operation.txt b/doc/design/new_operation.txt
diff --git a/doc/design/pvfs2-client.tex b/doc/design/pvfs2-client.tex
diff --git a/doc/design/pvfs2-trove-usage.tex b/doc/design/pvfs2-trove-usage.tex
diff --git a/doc/design/request-design.tex b/doc/design/request-design.tex
diff --git a/doc/design/state-machine.tex b/doc/design/state-machine.tex
diff --git a/doc/design/storage-interface.tex b/doc/design/storage-interface.tex
diff --git a/doc/design/trove-dbpf.tex b/doc/design/trove-dbpf.tex
diff --git a/doc/doxygen/pvfs2-doxygen.conf.in b/doc/doxygen/pvfs2-doxygen.conf.in
diff --git a/doc/figs/pvfs2-failover-AA.eps b/doc/figs/pvfs2-failover-AA.eps
diff --git a/doc/figs/pvfs2-failover-AA.fig b/doc/figs/pvfs2-failover-AA.fig
diff --git a/doc/figs/pvfs2-failover.eps b/doc/figs/pvfs2-failover.eps
diff --git a/doc/figs/pvfs2-failover.fig b/doc/figs/pvfs2-failover.fig
diff --git a/doc/intro.tex b/doc/intro.tex
diff --git a/doc/io-api-terms.tex b/doc/io-api-terms.tex
diff --git a/doc/latex2html-init b/doc/latex2html-init
diff --git a/doc/man/pvfs2-cp.1 b/doc/man/pvfs2-cp.1
diff --git a/doc/man/pvfs2-fs-dump.1 b/doc/man/pvfs2-fs-dump.1
diff --git a/doc/man/pvfs2-genconfig.1 b/doc/man/pvfs2-genconfig.1
diff --git a/doc/man/pvfs2-ls.1 b/doc/man/pvfs2-ls.1
diff --git a/doc/man/pvfs2-ping.1 b/doc/man/pvfs2-ping.1
diff --git a/doc/man/pvfs2-server.1 b/doc/man/pvfs2-server.1
diff --git a/doc/man/pvfs2-set-debugmask.1 b/doc/man/pvfs2-set-debugmask.1
diff --git a/doc/man/pvfs2-set-mode.1 b/doc/man/pvfs2-set-mode.1
diff --git a/doc/man/pvfs2-set-sync.1 b/doc/man/pvfs2-set-sync.1
diff --git a/doc/man/pvfs2-statfs.1 b/doc/man/pvfs2-statfs.1
diff --git a/doc/man/pvfs2.1 b/doc/man/pvfs2.1
diff --git a/doc/man/pvfs2.conf.5 b/doc/man/pvfs2.conf.5
diff --git a/doc/man/pvfs2tab.5 b/doc/man/pvfs2tab.5
diff --git a/doc/module.mk.in b/doc/module.mk.in
diff --git a/doc/multi-fs-doc.txt b/doc/multi-fs-doc.txt
diff --git a/doc/pvfs2-faq.tex b/doc/pvfs2-faq.tex
diff --git a/doc/pvfs2-guide.tex b/doc/pvfs2-guide.tex
diff --git a/doc/pvfs2-ha-heartbeat-v2.tex b/doc/pvfs2-ha-heartbeat-v2.tex
diff --git a/doc/pvfs2-ha.tex b/doc/pvfs2-ha.tex
diff --git a/doc/pvfs2-logging.txt b/doc/pvfs2-logging.txt
diff --git a/doc/pvfs2-sysint-errors.txt b/doc/pvfs2-sysint-errors.txt
diff --git a/doc/pvfs2-tuning.tex b/doc/pvfs2-tuning.tex
diff --git a/doc/random/SystemInterfaceTesting.tex b/doc/random/SystemInterfaceTesting.tex
diff --git a/doc/random/module.mk.in b/doc/random/module.mk.in
diff --git a/doc/terms.tex b/doc/terms.tex
diff --git a/doc/user-apis.tex b/doc/user-apis.tex
diff --git a/examples/heartbeat/Filesystem-qla-monitor b/examples/heartbeat/Filesystem-qla-monitor
diff --git a/examples/heartbeat/PVFS2 b/examples/heartbeat/PVFS2
diff --git a/examples/heartbeat/PVFS2-notify b/examples/heartbeat/PVFS2-notify
diff --git a/examples/heartbeat/apc-switched-pdu-hybrid-control.pl b/examples/heartbeat/apc-switched-pdu-hybrid-control.pl
diff --git a/examples/heartbeat/apc-switched-pdu-hybrid-monitor.pl b/examples/heartbeat/apc-switched-pdu-hybrid-monitor.pl
diff --git a/examples/heartbeat/apc-switched-pdu-hybrid-outlet-status.pl b/examples/heartbeat/apc-switched-pdu-hybrid-outlet-status.pl
diff --git a/examples/heartbeat/apc-switched-pdu-ssh-control.exp b/examples/heartbeat/apc-switched-pdu-ssh-control.exp
diff --git a/examples/heartbeat/apc-switched-pdu-ssh-monitor.exp b/examples/heartbeat/apc-switched-pdu-ssh-monitor.exp
diff --git a/examples/heartbeat/baytech-mgmt-control.exp b/examples/heartbeat/baytech-mgmt-control.exp
diff --git a/examples/heartbeat/baytech-mgmt-monitor.exp b/examples/heartbeat/baytech-mgmt-monitor.exp
diff --git a/examples/heartbeat/cib.xml.example b/examples/heartbeat/cib.xml.example
diff --git a/examples/heartbeat/hardware-specific/Filesystem-qla-monitor b/examples/heartbeat/hardware-specific/Filesystem-qla-monitor
diff --git a/examples/heartbeat/hardware-specific/PVFS2-notify b/examples/heartbeat/hardware-specific/PVFS2-notify
diff --git a/examples/heartbeat/hardware-specific/apc-switched-pdu-hybrid-control.pl b/examples/heartbeat/hardware-specific/apc-switched-pdu-hybrid-control.pl
diff --git a/examples/heartbeat/hardware-specific/apc-switched-pdu-hybrid-monitor.pl b/examples/heartbeat/hardware-specific/apc-switched-pdu-hybrid-monitor.pl
diff --git a/examples/heartbeat/hardware-specific/apc-switched-pdu-hybrid-outlet-status.pl b/examples/heartbeat/hardware-specific/apc-switched-pdu-hybrid-outlet-status.pl
diff --git a/examples/heartbeat/hardware-specific/apc-switched-pdu-ssh-control.exp b/examples/heartbeat/hardware-specific/apc-switched-pdu-ssh-control.exp
diff --git a/examples/heartbeat/hardware-specific/apc-switched-pdu-ssh-monitor.exp b/examples/heartbeat/hardware-specific/apc-switched-pdu-ssh-monitor.exp
diff --git a/examples/heartbeat/hardware-specific/baytech-mgmt-control.exp b/examples/heartbeat/hardware-specific/baytech-mgmt-control.exp
diff --git a/examples/heartbeat/hardware-specific/baytech-mgmt-monitor.exp b/examples/heartbeat/hardware-specific/baytech-mgmt-monitor.exp
diff --git a/examples/heartbeat/hardware-specific/pvfs2-stonith-plugin b/examples/heartbeat/hardware-specific/pvfs2-stonith-plugin
diff --git a/examples/heartbeat/hardware-specific/qla-monitor.pl b/examples/heartbeat/hardware-specific/qla-monitor.pl
diff --git a/examples/heartbeat/pvfs2-ha-heartbeat-configure.sh b/examples/heartbeat/pvfs2-ha-heartbeat-configure.sh
diff --git a/examples/heartbeat/pvfs2-stonith-plugin b/examples/heartbeat/pvfs2-stonith-plugin
diff --git a/examples/heartbeat/qla-monitor.pl b/examples/heartbeat/qla-monitor.pl
diff --git a/include/orange.h b/include/orange.h
diff --git a/include/pvfs2-compat.h b/include/pvfs2-compat.h
diff --git a/include/pvfs2-debug.h b/include/pvfs2-debug.h
diff --git a/include/pvfs2-dist-basic.h b/include/pvfs2-dist-basic.h
diff --git a/include/pvfs2-dist-simple-stripe.h b/include/pvfs2-dist-simple-stripe.h
diff --git a/include/pvfs2-dist-twod-stripe.h b/include/pvfs2-dist-twod-stripe.h
diff --git a/include/pvfs2-dist-varstrip.h b/include/pvfs2-dist-varstrip.h
diff --git a/include/pvfs2-encode-stubs.h b/include/pvfs2-encode-stubs.h
diff --git a/include/pvfs2-event.h b/include/pvfs2-event.h
diff --git a/include/pvfs2-hint.h b/include/pvfs2-hint.h
diff --git a/include/pvfs2-mgmt.h b/include/pvfs2-mgmt.h
diff --git a/include/pvfs2-mirror.h b/include/pvfs2-mirror.h
diff --git a/include/pvfs2-request.h b/include/pvfs2-request.h
diff --git a/include/pvfs2-sysint.h b/include/pvfs2-sysint.h
diff --git a/include/pvfs2-types.h b/include/pvfs2-types.h
diff --git a/include/pvfs2-usrint.h b/include/pvfs2-usrint.h
diff --git a/include/pvfs2-util.h b/include/pvfs2-util.h
diff --git a/include/pvfs2.h.in b/include/pvfs2.h.in
diff --git a/maint/TEMPLATE_COPYRIGHT_HEADER.txt b/maint/TEMPLATE_COPYRIGHT_HEADER.txt
diff --git a/maint/TEMPLATE_FORMAT_TRAILER.txt b/maint/TEMPLATE_FORMAT_TRAILER.txt
diff --git a/maint/config/aio.m4 b/maint/config/aio.m4
diff --git a/maint/config/bdb.m4 b/maint/config/bdb.m4
diff --git a/maint/config/gm.m4 b/maint/config/gm.m4
diff --git a/maint/config/ib.m4 b/maint/config/ib.m4
diff --git a/maint/config/kernel.m4 b/maint/config/kernel.m4
diff --git a/maint/config/mx.m4 b/maint/config/mx.m4
diff --git a/maint/config/openssl.m4 b/maint/config/openssl.m4
diff --git a/maint/config/portals.m4 b/maint/config/portals.m4
diff --git a/maint/config/rt.m4 b/maint/config/rt.m4
diff --git a/maint/config/zoid.m4 b/maint/config/zoid.m4
diff --git a/maint/make-dist.sh b/maint/make-dist.sh
diff --git a/module.mk.in b/module.mk.in
diff --git a/patches/pnfs/SERIES b/patches/pnfs/SERIES
diff --git a/patches/pnfs/p00001_pnfs_pvfs2layoutdriver.patch b/patches/pnfs/p00001_pnfs_pvfs2layoutdriver.patch
diff --git a/patches/pnfs/p00001_pnfs_pvfs2layoutsupport.patch b/patches/pnfs/p00001_pnfs_pvfs2layoutsupport.patch
diff --git a/patches/pnfs/p00002_pnfs_nfslayoutsupport.patch b/patches/pnfs/p00002_pnfs_nfslayoutsupport.patch
diff --git a/patches/pnfs/p00003_pnfs_nfsproclayoutsupport.patch b/patches/pnfs/p00003_pnfs_nfsproclayoutsupport.patch
diff --git a/patches/posix-ext/SERIES b/patches/posix-ext/SERIES
diff --git a/patches/posix-ext/posix-direntplus-lite.patch b/patches/posix-ext/posix-direntplus-lite.patch
diff --git a/patches/posix-ext/posix-direntplus.patch b/patches/posix-ext/posix-direntplus.patch
diff --git a/patches/posix-ext/posix-extensions-cvs.patch b/patches/posix-ext/posix-extensions-cvs.patch
diff --git a/patches/posix-ext/posix-readwritex.patch b/patches/posix-ext/posix-readwritex.patch
diff --git a/patches/posix-ext/posix-statlite-fix.patch b/patches/posix-ext/posix-statlite-fix.patch
diff --git a/patches/posix-ext/posix-statlite-x86_64.patch b/patches/posix-ext/posix-statlite-x86_64.patch
diff --git a/patches/posix-ext/posix-statlite.patch b/patches/posix-ext/posix-statlite.patch
diff --git a/pvfs2-config.h.in b/pvfs2-config.h.in
diff --git a/src/apps/admin/module.mk.in b/src/apps/admin/module.mk.in
diff --git a/src/apps/admin/pvfs2-change-fsid.c b/src/apps/admin/pvfs2-change-fsid.c
diff --git a/src/apps/admin/pvfs2-check-config.c b/src/apps/admin/pvfs2-check-config.c
diff --git a/src/apps/admin/pvfs2-check-server.c b/src/apps/admin/pvfs2-check-server.c
diff --git a/src/apps/admin/pvfs2-chmod.c b/src/apps/admin/pvfs2-chmod.c
diff --git a/src/apps/admin/pvfs2-chown.c b/src/apps/admin/pvfs2-chown.c
diff --git a/src/apps/admin/pvfs2-cp.c b/src/apps/admin/pvfs2-cp.c
@@ -119,7 +119,7 @@ static int convert_pvfs2_perms_to_mode(PVFS_permissions perms)
 int main (int argc, char ** argv)
 {
     struct options* user_opts = NULL;
-    double time1=0, time2=0;
+    double time1=0, time2=0, time3=0, time4=0, total_time=0;
     int current_size=0;
     int64_t total_written=0, buffer_size=0;
     file_object src, dest;
@@ -157,8 +157,11 @@ int main (int argc, char ** argv)
 	goto main_out;
     }
 
+    time3 = Wtime();
     ret = generic_open(&dest, &credentials, user_opts->num_datafiles, user_opts->strip_size,
                        user_opts->srcfile, OPEN_DEST);
+    time4 = Wtime();
+    total_time = total_time + time4 - time3;
     if (ret < 0)
     {
 	fprintf(stderr, "Could not open %s\n", user_opts->destfile);
@@ -174,14 +177,17 @@ int main (int argc, char ** argv)
 	goto main_out;
     }
 
-    time1 = Wtime();
+    //time1 = Wtime();
     while((current_size = generic_read(&src, buffer, 
 		    total_written, user_opts->buf_size, &credentials)) > 0)
     {
 	buffer_size = current_size;
-
+
+        time1 = Wtime();
 	ret = generic_write(&dest, buffer, total_written, 
 		buffer_size, &credentials);
+	time2 = Wtime();
+	total_time = total_time + time2 - time1;
 	if (ret != current_size)
 	{
 	    if (ret == -1) {
@@ -195,11 +201,11 @@ int main (int argc, char ** argv)
 	total_written += current_size;
     }
 
-    time2 = Wtime();
+    //time2 = Wtime();
 
     if (user_opts->show_timings) 
     {
-	print_timings(time2-time1, total_written);
+	print_timings(total_time, total_written);
     }
 
     ret = 0;
@@ -312,8 +318,9 @@ static double Wtime(void)
 
 static void print_timings( double time, int64_t total)
 {
-    printf("Wrote %lld bytes in %f seconds. %f MB/seconds\n",
-	    lld(total), time, (total/time)/(1024*1024));
+    //printf("Wrote %lld bytes in %f seconds. %f MB/seconds\n",
+	    //lld(total), time, (total/time)/(1024*1024));
+	printf("%f\n", time);
 }
 
 /* read 'count' bytes from a (unix or pvfs2) file 'src', placing the result in

diff --git a/src/apps/admin/pvfs2-drop-caches.c b/src/apps/admin/pvfs2-drop-caches.c
diff --git a/src/apps/admin/pvfs2-event-mon-example.c b/src/apps/admin/pvfs2-event-mon-example.c
diff --git a/src/apps/admin/pvfs2-fs-dump.c b/src/apps/admin/pvfs2-fs-dump.c
diff --git a/src/apps/admin/pvfs2-fsck.c b/src/apps/admin/pvfs2-fsck.c
diff --git a/src/apps/admin/pvfs2-fsck.h b/src/apps/admin/pvfs2-fsck.h
diff --git a/src/apps/admin/pvfs2-get-uid.c b/src/apps/admin/pvfs2-get-uid.c
diff --git a/src/apps/admin/pvfs2-ln.c b/src/apps/admin/pvfs2-ln.c
diff --git a/src/apps/admin/pvfs2-ls.c b/src/apps/admin/pvfs2-ls.c
diff --git a/src/apps/admin/pvfs2-lsplus.c b/src/apps/admin/pvfs2-lsplus.c
diff --git a/src/apps/admin/pvfs2-migrate-collection.c b/src/apps/admin/pvfs2-migrate-collection.c
diff --git a/src/apps/admin/pvfs2-mkdir.c b/src/apps/admin/pvfs2-mkdir.c
diff --git a/src/apps/admin/pvfs2-mkspace.c b/src/apps/admin/pvfs2-mkspace.c
diff --git a/src/apps/admin/pvfs2-perf-mon-example.c b/src/apps/admin/pvfs2-perf-mon-example.c
diff --git a/src/apps/admin/pvfs2-perf-mon-snmp.c b/src/apps/admin/pvfs2-perf-mon-snmp.c
diff --git a/src/apps/admin/pvfs2-perror.c b/src/apps/admin/pvfs2-perror.c
diff --git a/src/apps/admin/pvfs2-ping.c b/src/apps/admin/pvfs2-ping.c
diff --git a/src/apps/admin/pvfs2-remove-object.c b/src/apps/admin/pvfs2-remove-object.c
diff --git a/src/apps/admin/pvfs2-rm.c b/src/apps/admin/pvfs2-rm.c
diff --git a/src/apps/admin/pvfs2-set-debugmask.c b/src/apps/admin/pvfs2-set-debugmask.c
diff --git a/src/apps/admin/pvfs2-set-eventmask.c b/src/apps/admin/pvfs2-set-eventmask.c
diff --git a/src/apps/admin/pvfs2-set-mode.c b/src/apps/admin/pvfs2-set-mode.c
diff --git a/src/apps/admin/pvfs2-set-sync.c b/src/apps/admin/pvfs2-set-sync.c
diff --git a/src/apps/admin/pvfs2-showcoll.c b/src/apps/admin/pvfs2-showcoll.c
diff --git a/src/apps/admin/pvfs2-stat.c b/src/apps/admin/pvfs2-stat.c
diff --git a/src/apps/admin/pvfs2-statfs.c b/src/apps/admin/pvfs2-statfs.c
diff --git a/src/apps/admin/pvfs2-touch.c b/src/apps/admin/pvfs2-touch.c
diff --git a/src/apps/admin/pvfs2-viewdist.c b/src/apps/admin/pvfs2-viewdist.c
diff --git a/src/apps/admin/pvfs2-xattr.c b/src/apps/admin/pvfs2-xattr.c
diff --git a/src/apps/devel/module.mk.in b/src/apps/devel/module.mk.in
diff --git a/src/apps/devel/pvfs2-db-display.c b/src/apps/devel/pvfs2-db-display.c
diff --git a/src/apps/fuse/module.mk.in b/src/apps/fuse/module.mk.in
diff --git a/src/apps/fuse/pvfs2fuse.c b/src/apps/fuse/pvfs2fuse.c
diff --git a/src/apps/karma/color.c b/src/apps/karma/color.c
diff --git a/src/apps/karma/comm.c b/src/apps/karma/comm.c
diff --git a/src/apps/karma/details.c b/src/apps/karma/details.c
diff --git a/src/apps/karma/fsview.c b/src/apps/karma/fsview.c
diff --git a/src/apps/karma/karma.c b/src/apps/karma/karma.c
diff --git a/src/apps/karma/karma.h b/src/apps/karma/karma.h
diff --git a/src/apps/karma/menu.c b/src/apps/karma/menu.c
diff --git a/src/apps/karma/messages.c b/src/apps/karma/messages.c
diff --git a/src/apps/karma/module.mk.in b/src/apps/karma/module.mk.in
diff --git a/src/apps/karma/prep.c b/src/apps/karma/prep.c
diff --git a/src/apps/karma/status.c b/src/apps/karma/status.c
diff --git a/src/apps/karma/traffic.c b/src/apps/karma/traffic.c
diff --git a/src/apps/karma/units.c b/src/apps/karma/units.c
diff --git a/src/apps/kernel/linux/module.mk.in b/src/apps/kernel/linux/module.mk.in
diff --git a/src/apps/kernel/linux/mount.pvfs2.c b/src/apps/kernel/linux/mount.pvfs2.c
diff --git a/src/apps/kernel/linux/mount_pvfs2.sh b/src/apps/kernel/linux/mount_pvfs2.sh
diff --git a/src/apps/kernel/linux/pvfs2-client-core.c b/src/apps/kernel/linux/pvfs2-client-core.c
diff --git a/src/apps/kernel/linux/pvfs2-client.c b/src/apps/kernel/linux/pvfs2-client.c
diff --git a/src/apps/kernel/linux/umount_pvfs2.sh b/src/apps/kernel/linux/umount_pvfs2.sh
diff --git a/src/apps/ucache/module.mk.in b/src/apps/ucache/module.mk.in
diff --git a/src/apps/ucache/shmem_util.c b/src/apps/ucache/shmem_util.c
diff --git a/src/apps/ucache/shmem_util.h b/src/apps/ucache/shmem_util.h
diff --git a/src/apps/ucache/ucached.c b/src/apps/ucache/ucached.c
diff --git a/src/apps/ucache/ucached.h b/src/apps/ucache/ucached.h
diff --git a/src/apps/ucache/ucached_cmd.c b/src/apps/ucache/ucached_cmd.c
diff --git a/src/apps/ucache/ucached_common.c b/src/apps/ucache/ucached_common.c
diff --git a/src/apps/user/getmattr.c b/src/apps/user/getmattr.c
diff --git a/src/apps/user/module.mk.in b/src/apps/user/module.mk.in
diff --git a/src/apps/user/setmattr.c b/src/apps/user/setmattr.c
diff --git a/src/apps/vis/VeraBd.ttf b/src/apps/vis/VeraBd.ttf
diff --git a/src/apps/vis/module.mk.in b/src/apps/vis/module.mk.in
diff --git a/src/apps/vis/pvfs2-vis-bw-2d.c b/src/apps/vis/pvfs2-vis-bw-2d.c
diff --git a/src/apps/vis/pvfs2-vis.c b/src/apps/vis/pvfs2-vis.c
diff --git a/src/apps/vis/pvfs2-vis.h b/src/apps/vis/pvfs2-vis.h
diff --git a/src/apps/vis/simple.c b/src/apps/vis/simple.c
diff --git a/src/client/sysint/TODO b/src/client/sysint/TODO
diff --git a/src/client/sysint/acache.c b/src/client/sysint/acache.c
diff --git a/src/client/sysint/acache.h b/src/client/sysint/acache.h
diff --git a/src/client/sysint/client-job-timer.sm b/src/client/sysint/client-job-timer.sm
diff --git a/src/client/sysint/client-state-machine.c b/src/client/sysint/client-state-machine.c
diff --git a/src/client/sysint/client-state-machine.h b/src/client/sysint/client-state-machine.h
@@ -308,6 +308,8 @@ struct PINT_client_readdirplus_sm
     PVFS_BMI_addr_t *server_addresses;
     int  *handle_count;
     PVFS_handle     **handles;
+    int remaining;
+    int offset;
 };
 
 /*

diff --git a/src/client/sysint/consistancy_semantics.txt b/src/client/sysint/consistancy_semantics.txt
diff --git a/src/client/sysint/error-details.c b/src/client/sysint/error-details.c
diff --git a/src/client/sysint/finalize.c b/src/client/sysint/finalize.c
diff --git a/src/client/sysint/fs-add.sm b/src/client/sysint/fs-add.sm
diff --git a/src/client/sysint/getparent.c b/src/client/sysint/getparent.c
diff --git a/src/client/sysint/initialize.c b/src/client/sysint/initialize.c
diff --git a/src/client/sysint/mgmt-create-dirent.sm b/src/client/sysint/mgmt-create-dirent.sm
diff --git a/src/client/sysint/mgmt-event-mon-list.sm b/src/client/sysint/mgmt-event-mon-list.sm
diff --git a/src/client/sysint/mgmt-get-dfile-array.sm b/src/client/sysint/mgmt-get-dfile-array.sm
diff --git a/src/client/sysint/mgmt-get-dirdata-handle.sm b/src/client/sysint/mgmt-get-dirdata-handle.sm
diff --git a/src/client/sysint/mgmt-get-uid-list.sm b/src/client/sysint/mgmt-get-uid-list.sm
diff --git a/src/client/sysint/mgmt-iterate-handles-list.sm b/src/client/sysint/mgmt-iterate-handles-list.sm
diff --git a/src/client/sysint/mgmt-misc.c b/src/client/sysint/mgmt-misc.c
diff --git a/src/client/sysint/mgmt-noop.sm b/src/client/sysint/mgmt-noop.sm
diff --git a/src/client/sysint/mgmt-perf-mon-list.sm b/src/client/sysint/mgmt-perf-mon-list.sm
diff --git a/src/client/sysint/mgmt-remove-dirent.sm b/src/client/sysint/mgmt-remove-dirent.sm
diff --git a/src/client/sysint/mgmt-remove-object.sm b/src/client/sysint/mgmt-remove-object.sm
diff --git a/src/client/sysint/mgmt-repair-file.sm b/src/client/sysint/mgmt-repair-file.sm
diff --git a/src/client/sysint/mgmt-setparam-list.sm b/src/client/sysint/mgmt-setparam-list.sm
diff --git a/src/client/sysint/mgmt-statfs-list.sm b/src/client/sysint/mgmt-statfs-list.sm
diff --git a/src/client/sysint/module.mk.in b/src/client/sysint/module.mk.in
diff --git a/src/client/sysint/ncache.c b/src/client/sysint/ncache.c
diff --git a/src/client/sysint/ncache.h b/src/client/sysint/ncache.h
diff --git a/src/client/sysint/osd.c b/src/client/sysint/osd.c
diff --git a/src/client/sysint/osd.h b/src/client/sysint/osd.h
diff --git a/src/client/sysint/osdsm.sm b/src/client/sysint/osdsm.sm
diff --git a/src/client/sysint/perf-count-timer.sm b/src/client/sysint/perf-count-timer.sm
diff --git a/src/client/sysint/pint-sysdev-unexp.sm b/src/client/sysint/pint-sysdev-unexp.sm
diff --git a/src/client/sysint/pint-sysint-utils.c b/src/client/sysint/pint-sysint-utils.c
diff --git a/src/client/sysint/pint-sysint-utils.h b/src/client/sysint/pint-sysint-utils.h
diff --git a/src/client/sysint/remove.sm b/src/client/sysint/remove.sm
@@ -370,11 +370,11 @@ static PINT_sm_action remove_collection(
         sm_p->object_ref.fs_id);
     PINT_put_server_config_struct(server_config);
 
-    if ((!is_osd_md && (!(server_config->member_attr) || sm_p->getattr.attr.objtype != PVFS_TYPE_DIRECTORY)) || (sm_p->getattr.attr.objtype != PVFS_TYPE_DIRECTORY && is_osd_md) || (!server_config->coll_object)) {
+    if ((!is_osd_md && (!(server_config->member_attr) || sm_p->getattr.attr.objtype != PVFS_TYPE_DIRECTORY)) || (sm_p->getattr.attr.objtype != PVFS_TYPE_DIRECTORY && is_osd_md) || (is_osd_md && !server_config->coll_object)) {
         js_p->error_code = SKIP_COLLECTION_REMOVAL;
         return SM_ACTION_COMPLETE;
     }
- 
+
     cur = server_config->host_aliases;
     while(cur)
     {

diff --git a/src/client/sysint/server-get-config.sm b/src/client/sysint/server-get-config.sm
diff --git a/src/client/sysint/sys-create.sm b/src/client/sysint/sys-create.sm
@@ -488,12 +488,12 @@ static int create_comp_fn(void *v_p,
                resp_p->u.create.datafile_handles,
                (sizeof(*sm_p->u.create.datafile_handles) *
                resp_p->u.create.datafile_count));
-       
+
         if (is_osd_md && server_config->post_create)
            sm_p->u.create.metafile_handle = sm_p->u.create.datafile_handles[0];
         else
            sm_p->u.create.metafile_handle = resp_p->u.create.metafile_handle;
- 
+
         sm_p->u.create.stuffed = resp_p->u.create.stuffed;
     }
 
@@ -700,7 +700,6 @@ static PINT_sm_action create_create_setup_msgpair(
         js_p->error_code = OSD_MSGPAIR;
 
     } else {
-
         PINT_SERVREQ_CREATE_FILL(
             msg_p->req,
             *sm_p->cred_p,
@@ -713,6 +712,7 @@ static PINT_sm_action create_create_setup_msgpair(
         js_p->error_code = 0;
         if (is_osd && !server_config->post_create)
             js_p->error_code = OSD_CREATE_MSGPAIR;
+
     }
 
     msg_p->fs_id = sm_p->object_ref.fs_id;
@@ -809,7 +809,7 @@ static PINT_sm_action create_datafiles_setup_msgpair_array(
     if (is_osd) {
         uint64_t attrval;
         struct osd_command *command = &sm_p->msgarray_op.msgarray[0].osd_command;
-
+	
         if (is_osd_md)
         {
            /* needed for osd_md */
@@ -937,11 +937,24 @@ static PINT_sm_action create_datafiles_setup_msgpair_array(
     }
 
     msg_p->fs_id = sm_p->object_ref.fs_id;
-    msg_p->handle = sm_p->u.create.io_handle_extent_array[0].
-        extent_array[0].first;
+
+    if (is_osd_md)
+	msg_p->handle = sm_p->u.create.io_handle_extent_array[0].extent_array[0].first;
+    else
+    	msg_p->handle = sm_p->u.create.datafile_handles[0];
+
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = create_datafiles_comp_fn;
-    msg_p->svr_addr = sm_p->u.create.data_server_addrs[0];
+
+    ret = PINT_cached_config_map_to_server(
+	    &msg_p->svr_addr, msg_p->handle,
+            sm_p->object_ref.fs_id);
+
+    if (ret)
+    {
+   	 gossip_err("Failed to map meta server address\n");
+         js_p->error_code = ret;
+    }
 
     PINT_sm_push_frame(smcb, 0, &sm_p->msgarray_op);
 

diff --git a/src/client/sysint/sys-del-eattr.sm b/src/client/sysint/sys-del-eattr.sm
diff --git a/src/client/sysint/sys-dist.c b/src/client/sysint/sys-dist.c
diff --git a/src/client/sysint/sys-flush.sm b/src/client/sysint/sys-flush.sm
diff --git a/src/client/sysint/sys-get-eattr.sm b/src/client/sysint/sys-get-eattr.sm
diff --git a/src/client/sysint/sys-getattr.sm b/src/client/sysint/sys-getattr.sm
diff --git a/src/client/sysint/sys-io.sm b/src/client/sysint/sys-io.sm
diff --git a/src/client/sysint/sys-list-eattr.sm b/src/client/sysint/sys-list-eattr.sm
diff --git a/src/client/sysint/sys-lookup.sm b/src/client/sysint/sys-lookup.sm
@@ -707,7 +707,6 @@ static PINT_sm_action lookup_segment_setup_msgpair(struct PINT_smcb *smcb,
     ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                            cur_seg->seg_starting_refn.handle,
                                            cur_seg->seg_starting_refn.fs_id);
-
     if (ret)
     {
         gossip_err("Failed to map meta server address\n");

diff --git a/src/client/sysint/sys-mkdir.sm b/src/client/sysint/sys-mkdir.sm
@@ -547,6 +547,9 @@ static PINT_sm_action create_collection_setup_msgpair(
     uint64_t attrval;
     int is_osd = fsid_is_osd(sm_p->object_ref.fs_id);
     int is_osd_md = fsid_is_osd_md(sm_p->object_ref.fs_id);
+    int server_count = 0;
+    int randsrv = 0;
+    int iterator = 0;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG,
                  "mkdir state: create_collection_setup_msgpair\n");  
@@ -556,8 +559,8 @@ static PINT_sm_action create_collection_setup_msgpair(
     server_config = PINT_get_server_config_struct(
         sm_p->object_ref.fs_id);
     PINT_put_server_config_struct(server_config);
-    
-    if (!is_osd || !server_config->coll_object) {
+
+    if (!is_osd || (is_osd_md && !server_config->coll_object)) {
         js_p->error_code = SKIP_COLLECTION_CREATE;
         return SM_ACTION_COMPLETE;
     }
@@ -570,11 +573,28 @@ static PINT_sm_action create_collection_setup_msgpair(
         {
             break;
         }
-        if(!strncmp(cur_alias->bmi_address, "osd", 3)) { 
+
+        cur = PINT_llist_next(cur);
+	server_count++;
+    }
+
+    randsrv = (rand() % server_count);
+    cur = server_config->host_aliases;
+
+    while (cur)
+    {
+        cur_alias = PINT_llist_head(cur);
+        if (!cur_alias)
+        {
+            break;
+        }
+        if( (iterator >= randsrv) && (!strncmp(cur_alias->bmi_address, "osd", 3))) {
             BMI_addr_lookup(&addr,cur_alias->bmi_address);
+	    break;
         }
 
         cur = PINT_llist_next(cur);
+        iterator++;
     }
 
     PINT_msgpair_init(&sm_p->msgarray_op);
@@ -642,7 +662,7 @@ static PINT_sm_action create_collection_setup_msgpair(
         attr[6].len = CCAP_OID_LEN;
     }
 
-    ret = osd_command_set_create_collection(command, PVFS_OSD_META_PID, sm_p->u.mkdir.cid);
+    ret = osd_command_set_create_collection(command, (server_config->member_attr ? PVFS_OSD_DATA_PID : PVFS_OSD_META_PID), sm_p->u.mkdir.cid);
 
     if (ret) {
         osd_error_xerrno(ret, "%s: osd_command_set_create_collection failed",
@@ -700,10 +720,10 @@ static int create_collection_comp_fn(void *v_p,
             return ret;
         }
         sm_p->u.mkdir.cid = get_ntohll(sm_p->msgarray_op.msgpair.osd_command.attr[6].val);
+        sm_p->u.mkdir.metafile_handle = sm_p->u.mkdir.cid;
     }
 
     sm_p->object_ref.cid = sm_p->u.mkdir.cid;
-    sm_p->u.mkdir.metafile_handle = sm_p->object_ref.cid;
 
     return 0;
 }

diff --git a/src/client/sysint/sys-osd-dir.sm b/src/client/sysint/sys-osd-dir.sm
@@ -247,6 +247,7 @@ static PINT_sm_action osd_dirops_init(
 static PINT_sm_action osd_dirops_attr1_init(
                       struct PINT_smcb *smcb, job_status_s *js_p)
 {
+    osd_debug("osd_dirops_attr1_init\n");
     job_id_t tmp_id;
     struct PINT_client_sm *sm_p;
 
@@ -361,6 +362,7 @@ static int osd_dirops_attr1_remove_comp_fn(void *v_p,
 static PINT_sm_action osd_dirops_attr1_setup_msgpair(
                       struct PINT_smcb *smcb, job_status_s *js_p)
 {
+    osd_debug("attr1_setup_msgpair\n");
     int ret = 0;
     uint64_t oid;
     uint8_t *dirent = NULL;
@@ -438,6 +440,8 @@ static PINT_sm_action osd_dirops_attr1_setup_msgpair(
         msg_p->fs_id = sm_p->object_ref.fs_id;
         msg_p->handle = sm_p->object_ref.handle;
         object_name = sm_p->u.mkdir.object_name;
+	osd_debug("msg_p->handle: %d\n", msg_p->handle);
+	osd_debug("object_name: %s\n", object_name);
 
         /* cmp */
         attr[0].type = ATTR_SET;
@@ -523,13 +527,15 @@ static PINT_sm_action osd_dirops_attr1_setup_msgpair(
         js_p->error_code = ret;
     }
 
+    PINT_sm_push_frame(smcb, 0, &sm_p->msgarray_op);
     return SM_ACTION_COMPLETE;
 }
 
 static int osd_dirops_attr1_comp_fn(void *v_p,
                                     struct PVFS_server_resp *resp_p,
                                     int index)
 {
+    osd_debug("attr1_comp_fn\n");
     int ret = 0;
     PINT_smcb *smcb = v_p;
     PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
@@ -553,6 +559,7 @@ static int osd_dirops_attr1_comp_fn(void *v_p,
     if (smcb->op == PVFS_SYS_CREATE || smcb->op == PVFS_SYS_MKDIR) {
         /* insert dirent operation */
         if (command->attr[2].val == NULL) {
+	    osd_debug("successful\n");
             /* successful insert operation */
             ret = 0;
             goto out;

diff --git a/src/client/sysint/sys-osd-io.sm b/src/client/sysint/sys-osd-io.sm
@@ -384,7 +384,7 @@ static int osd_io_setup_msgpairs(struct PINT_smcb *smcb, job_status_s *js_p)
                    uint64_t attrval;
 
                    if (is_osd_md)
-                   {        
+                   {       
                       /* needed for osd_md */
                       char *dist_buf;
                       attr->perms = PVFS_PERM_VALID;
@@ -429,10 +429,10 @@ static int osd_io_setup_msgpairs(struct PINT_smcb *smcb, job_status_s *js_p)
                    {
                       struct attribute_list attrs = {ATTR_SET, ANY_PG + USER_COLL_PG, 1, &attrval, 8};
 
-                       if(!sm_p->getattr.attr.cid) {
-                          sm_p->getattr.attr.cid = COLLECTION_OID_LB; /* root directory */
-                       }
-                       set_htonll(&attrval, sm_p->getattr.attr.cid);
+                      if(!sm_p->getattr.attr.cid) {
+                        sm_p->getattr.attr.cid = COLLECTION_OID_LB; /* root directory */
+                      }
+                      set_htonll(&attrval, sm_p->getattr.attr.cid);
 
                       osd_command_set_create_and_write(command, PVFS_OSD_DATA_PID, datafile_handle, len, target_offset[0]);
                       osd_command_attr_build(command, &attrs, 1);

diff --git a/src/client/sysint/sys-readdir.sm b/src/client/sysint/sys-readdir.sm
@@ -1,5 +1,5 @@
 /* 
- * (C) 2003 Clemson University and The University of Chicago 
+ * (C) 2003 Clemson University and The University of Chicago
  *
  * See COPYING in top-level directory.
  */