Version after ccgrid

SNSL · Jan 9, 2013 · 1139b72 · 1139b72
1 parent 60ef726
commit 1139b72
Show file tree

Hide file tree

Showing 1,164 changed files with 79 additions and 9 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/cert-utils/pvfs2-grid-proxy-init.sh b/cert-utils/pvfs2-grid-proxy-init.sh
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-11-15-124111,;t t
+s,@PVFS2_VERSION@,2.8.6-orangefs-2012-12-29-223514,;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/developer-guidelines.tex b/doc/coding/developer-guidelines.tex
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-quickstart.tex b/doc/pvfs2-quickstart.tex
diff --git a/doc/pvfs2-status.tex b/doc/pvfs2-status.tex
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/examples/pvfs2-server.rc.in b/examples/pvfs2-server.rc.in
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/build/mpich2-build.py b/maint/build/mpich2-build.py
diff --git a/maint/build/pvfs2-build-tests.sh b/maint/build/pvfs2-build-tests.sh
diff --git a/maint/build/pvfs2-build.sh b/maint/build/pvfs2-build.sh
diff --git a/maint/build/pvfs2-buildandrun.sh b/maint/build/pvfs2-buildandrun.sh
diff --git a/maint/build/pvfs2-extract-make-msgs.pl b/maint/build/pvfs2-extract-make-msgs.pl
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/config.guess b/maint/config/config.guess
diff --git a/maint/config/config.sub b/maint/config/config.sub
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/install-sh b/maint/config/install-sh
diff --git a/maint/config/kernel.m4 b/maint/config/kernel.m4
diff --git a/maint/config/missing b/maint/config/missing
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/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/prepare b/prepare
diff --git a/pvfs2-config.h.in b/pvfs2-config.h.in
diff --git a/src/apps/admin/pvfs2-cp.c b/src/apps/admin/pvfs2-cp.c
@@ -615,8 +615,9 @@ static int generic_open(file_object *obj, PVFS_credentials *credentials,
 	{
 	    if (ret == 0)
 	    {
-		fprintf(stderr, "Target file %s already exists\n", entry_name);
-		return (-1);
+		//fprintf(stderr, "Target file %s already exists\n", entry_name);
+		//return (-1);
+		obj->u.pvfs2.ref = resp_lookup.ref;
 	    } 
 	    else 
 	    {

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/ucache/watch_daemons b/src/apps/ucache/watch_daemons
diff --git a/src/apps/ucache/watch_ipcs b/src/apps/ucache/watch_ipcs
diff --git a/src/apps/ucache/watch_log b/src/apps/ucache/watch_log
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
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-config.c b/src/client/sysint/mgmt-get-config.c
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
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
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
@@ -606,7 +606,7 @@ static PINT_sm_action io_datafile_setup_msgpairs(
             assert(attr->mask & PVFS_ATTR_META_DIST);
             assert(attr->u.meta.dist_size > 0);
             assert(attr->u.meta.dfile_array);
-            assert(attr->u.meta.dfile_count > 0);
+            //assert(attr->u.meta.dfile_count > 0);
             if (attr->mask & PVFS_ATTR_META_MIRROR_DFILES && !is_osd)
             {
                 assert(attr->u.meta.mirror_dfile_array);
@@ -657,6 +657,15 @@ static PINT_sm_action io_datafile_setup_msgpairs(
         js_p->error_code = -PVFS_ENOMEM;
         goto datafile_index_array_destroy;
     }
+
+    if (is_osd & !attr->u.meta.dfile_count)
+    {
+        /* underlying storage is OSD */
+        gossip_debug(GOSSIP_IO_DEBUG, "  %s: doing OSD I/O\n", __func__);
+        sm_p->u.io.small_io = 1;  /* disable some flow IO checks */
+        js_p->error_code = IO_DO_OSD_IO;
+        goto sio_array_destroy;
+    }
 
     ret = io_find_target_datafiles(
         sm_p->u.io.mem_req,

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
diff --git a/src/client/sysint/sys-mkdir.sm b/src/client/sysint/sys-mkdir.sm
diff --git a/src/client/sysint/sys-osd-dir.sm b/src/client/sysint/sys-osd-dir.sm
diff --git a/src/client/sysint/sys-osd-io.sm b/src/client/sysint/sys-osd-io.sm
@@ -77,6 +77,18 @@ nested machine pvfs2_client_osd_io_sm
     state analyze_results
     {
         run osd_io_analyze_results;
+        default => test_reconstruct;
+    }
+
+    state test_reconstruct
+    {
+	run osd_reconstruct_setup_msgpair;
+	default => test_reconstruct_xfer_osd_msgpairs;
+    }
+
+    state test_reconstruct_xfer_osd_msgpairs
+    {
+        jump pvfs2_osd_msgpairarray_sm;
         default => cleanup;
     }
 
@@ -95,7 +107,9 @@ static int osd_io_init(struct PINT_smcb *smcb, job_status_s *js_p)
     struct PINT_client_io_sm *io = &sm_p->u.io;
     PVFS_object_attr *attr = &sm_p->getattr.attr;
     int i, ret;
-
+
+    io->datafile_count = 1;
+    sm_p->getattr.attr.u.meta.dfile_count = 1;
     ret = PINT_msgpairarray_init(&sm_p->msgarray_op, io->datafile_count);
     if (ret)
         goto out;
@@ -137,8 +151,9 @@ static int osd_io_init(struct PINT_smcb *smcb, job_status_s *js_p)
     io->file_data[0].extend_flag = 1;  /* always disable fsize checking */
 
     for (i=0; i<io->datafile_count; i++) {
-        PVFS_handle datafile_handle = attr->u.meta.dfile_array[
-                                                io->datafile_index_array[i]];
+        //PVFS_handle datafile_handle = attr->u.meta.dfile_array[
+        //                                        io->datafile_index_array[i]];
+	PVFS_handle datafile_handle = sm_p->object_ref.handle;
         gossip_debug(GOSSIP_IO_DEBUG, "%s: server %d/%d handle %llu\n",
                      __func__, i, io->datafile_count,
                      llu(datafile_handle));
@@ -225,7 +240,8 @@ static int osd_io_setup_msgpairs(struct PINT_smcb *smcb, job_status_s *js_p)
         PVFS_handle datafile_handle;
         int j;
 
-        datafile_handle = attr->u.meta.dfile_array[io->datafile_index_array[i]];
+        //datafile_handle = attr->u.meta.dfile_array[io->datafile_index_array[i]];
+	datafile_handle = sm_p->object_ref.handle;
 
         if (PINT_REQUEST_DONE(&io->file_req_state[i]) || io->short_read[i]) {
             gossip_debug(GOSSIP_IO_DEBUG, "%s: Nothing to do for server %d\n",
@@ -906,6 +922,50 @@ static int osd_io_cleanup(struct PINT_smcb *smcb, job_status_s *js_p)
     return 1;
 }
 
+static PINT_sm_action osd_reconstruct_setup_msgpair(
+        struct PINT_smcb *smcb, job_status_s *js_p)
+{
+    struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
+    int ret = -PVFS_EINVAL;
+    PINT_sm_msgpair_state *msg_p = NULL;
+
+    PINT_msgpair_init(&sm_p->msgarray_op);
+    msg_p = &sm_p->msgarray_op.msgpair;
+
+    struct osd_command *command = &msg_p->osd_command;
+
+    ret = osd_command_set_reconstruct(command, PVFS_OSD_DATA_PID);
+
+    command->outdata = "test";
+    command->outlen = 4;
+
+    if (ret) {
+	osd_error_xerrno(ret, "%s: osd_command_set_remove failed",
+                __func__);
+        js_p->error_code = ret;
+        return 1;
+    }
+
+    js_p->error_code = 0;
+
+    msg_p->fs_id = sm_p->object_ref.fs_id;
+    msg_p->handle = sm_p->object_ref.handle;
+    msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
+    msg_p->comp_fn = NULL;
+
+    ret = PINT_cached_config_map_to_server(
+        &msg_p->svr_addr, msg_p->handle, msg_p->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);
+    return SM_ACTION_COMPLETE;
+}
+
 /*
  * Local variables:
  *  mode: c

diff --git a/src/client/sysint/sys-readdir.sm b/src/client/sysint/sys-readdir.sm
diff --git a/src/client/sysint/sys-readdirplus.sm b/src/client/sysint/sys-readdirplus.sm
diff --git a/src/client/sysint/sys-remove.sm b/src/client/sysint/sys-remove.sm
diff --git a/src/client/sysint/sys-rename.sm b/src/client/sysint/sys-rename.sm
diff --git a/src/client/sysint/sys-set-eattr.sm b/src/client/sysint/sys-set-eattr.sm
diff --git a/src/client/sysint/sys-setattr.sm b/src/client/sysint/sys-setattr.sm
diff --git a/src/client/sysint/sys-small-io.sm b/src/client/sysint/sys-small-io.sm
diff --git a/src/client/sysint/sys-statfs.sm b/src/client/sysint/sys-statfs.sm
diff --git a/src/client/sysint/sys-symlink.sm b/src/client/sysint/sys-symlink.sm
diff --git a/src/client/sysint/sys-truncate.sm b/src/client/sysint/sys-truncate.sm
diff --git a/src/client/usrint/Makefile b/src/client/usrint/Makefile
diff --git a/src/client/usrint/README b/src/client/usrint/README
diff --git a/src/client/usrint/iocommon.c b/src/client/usrint/iocommon.c
diff --git a/src/client/usrint/iocommon.h b/src/client/usrint/iocommon.h
diff --git a/src/client/usrint/mmap.c b/src/client/usrint/mmap.c
diff --git a/src/client/usrint/module.mk.in b/src/client/usrint/module.mk.in
diff --git a/src/client/usrint/openfile-util.c b/src/client/usrint/openfile-util.c
diff --git a/src/client/usrint/openfile-util.h b/src/client/usrint/openfile-util.h
diff --git a/src/client/usrint/posix-ops.h b/src/client/usrint/posix-ops.h
diff --git a/src/client/usrint/posix-pvfs.c b/src/client/usrint/posix-pvfs.c
diff --git a/src/client/usrint/posix-pvfs.h b/src/client/usrint/posix-pvfs.h
diff --git a/src/client/usrint/posix.c b/src/client/usrint/posix.c