Changeset 8330

Timestamp:

05/21/10 13:34:36 (3 years ago)

Author:

nlmills

Message:

revert cu-security-branch to before the attempted merge with Orange-Branch

Location:

branches/cu-security-branch

Files:

• . (modified) (1 prop)
• .project (added)
• Makefile.in (modified) (13 diffs)
• PVFS2-GLOBAL-TODO.txt (added)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• doc/coding (modified) (1 prop)
• doc/coding/romio-MPICH2-0.96p2-PVFS2-0.51.diff (modified) (45 diffs)
• doc/design (modified) (1 prop)
• doc/design/concepts.tex (modified) (1 diff)
• doc/design/figs/getconfiginit.eps (modified) (previous)
• doc/design/figs/getconfigservop.eps (modified) (previous)
• doc/design/handle-allocator.tex (modified) (1 diff)
• doc/doxygen (modified) (1 prop)
• doc/random (modified) (1 prop)
• examples (modified) (1 prop)
• include/pvfs2-debug.h (modified) (1 diff)
• include/pvfs2-mirror.h (deleted)
• include/pvfs2-sysint.h (modified) (1 diff)
• include/pvfs2-types.h (modified) (3 diffs)
• include/pvfs2.h (added)
• module.mk.in (modified) (1 diff)
• src/apps/admin (modified) (1 prop)
• src/apps/admin/pvfs2-cp.c (modified) (1 diff)
• src/apps/admin/pvfs2-genconfig (modified) (1 diff)
• src/apps/admin/pvfs2-getmattr (deleted)
• src/apps/admin/pvfs2-lsplus.c (added)
• src/apps/admin/pvfs2-setmattr (deleted)
• src/apps/admin/pvfs2-xattr.c (modified) (14 diffs)
• src/apps/fuse/pvfs2fuse.c (modified) (2 diffs)
• src/apps/karma (modified) (1 prop)
• src/apps/kernel/linux (modified) (1 prop)
• src/apps/vis (modified) (1 prop)
• src/client/sysint (modified) (1 prop)
• src/client/sysint/client-state-machine.h (modified) (1 diff)
• src/client/sysint/mgmt-iterate-handles-list.sm (modified) (2 diffs)
• src/client/sysint/sys-io.sm (modified) (2 diffs)
• src/client/sysint/sys-set-eattr.sm (modified) (1 diff)
• src/common/dotconf (modified) (1 prop)
• src/common/events/debug.h (modified) (1 diff)
• src/common/events/fmt_fsm.c (modified) (1 diff)
• src/common/events/fmt_fsm.h (modified) (2 diffs)
• src/common/events/pvfs_tau_api.c (modified) (1 diff)
• src/common/events/pvfs_tau_api.h (modified) (1 diff)
• src/common/gen-locks (modified) (1 prop)
• src/common/gossip (modified) (1 prop)
• src/common/id-generator (modified) (1 prop)
• src/common/llist (modified) (1 prop)
• src/common/misc (modified) (1 prop)
• src/common/misc/msgpairarray.h (modified) (1 diff)
• src/common/misc/msgpairarray.sm (modified) (4 diffs)
• src/common/misc/pint-cached-config.c (modified) (1 diff)
• src/common/misc/pint-cached-config.h (modified) (1 diff)
• src/common/misc/pvfs2-debug.c (modified) (1 diff)
• src/common/misc/pvfs2-internal.h (modified) (1 diff)
• src/common/misc/pvfs2-util.c (modified) (1 diff)
• src/common/misc/state-machine.h (modified) (2 diffs)
• src/common/misc/str-utils.c (modified) (6 diffs)
• src/common/quickhash (modified) (1 prop)
• src/common/quicklist (modified) (1 prop)
• src/common/quicklist/quicklist.h (modified) (1 diff)
• src/common/security (modified) (1 prop)
• src/common/statecomp (modified) (1 prop)
• src/io/bmi (modified) (1 prop)
• src/io/bmi/bmi-method-callback.h (modified) (1 diff)
• src/io/bmi/bmi.c (modified) (5 diffs)
• src/io/bmi/bmi_gm (modified) (1 prop)
• src/io/bmi/bmi_ib (modified) (1 prop)
• src/io/bmi/bmi_mx (modified) (1 prop)
• src/io/bmi/bmi_portals (modified) (1 prop)
• src/io/bmi/bmi_tcp (modified) (1 prop)
• src/io/bmi/bmi_tcp/bmi-tcp.c (modified) (1 diff)
• src/io/bmi/bmi_tcp/socket-collection-epoll.c (modified) (1 diff)
• src/io/buffer (modified) (1 prop)
• src/io/description (modified) (1 prop)
• src/io/description/pint-request.c (modified) (4 diffs)
• src/io/dev (modified) (1 prop)
• src/io/flow (modified) (1 prop)
• src/io/flow/flowproto-bmi-cache (modified) (1 prop)
• src/io/flow/flowproto-bmi-trove (modified) (1 prop)
• src/io/flow/flowproto-dump-offsets (modified) (1 prop)
• src/io/flow/flowproto-template (modified) (1 prop)
• src/io/job (modified) (1 prop)
• src/io/job/job-desc-queue.h (modified) (1 diff)
• src/io/job/job.c (modified) (7 diffs)
• src/io/job/job.h (modified) (3 diffs)
• src/io/trove (modified) (1 prop)
• src/io/trove/trove-dbpf (modified) (1 prop)
• src/io/trove/trove-dbpf/dbpf-bstream-direct.c (modified) (1 diff)
• src/io/trove/trove-dbpf/dbpf-bstream.c (modified) (1 diff)
• src/io/trove/trove-dbpf/dbpf-dspace.c (modified) (2 diffs)
• src/io/trove/trove-handle-mgmt (modified) (1 prop)
• src/kernel/linux-2.4 (modified) (1 prop)
• src/kernel/linux-2.6 (modified) (1 prop)
• src/kernel/linux-2.6/namei.c (modified) (1 diff)
• src/kernel/linux-2.6/pvfs2-utils.c (modified) (7 diffs)
• src/proto (modified) (1 prop)
• src/proto/PINT-le-bytefield.c (modified) (17 diffs)
• src/proto/pvfs2-req-proto.h (modified) (4 diffs)
• src/server (modified) (1 prop)
• src/server/create-immutable-copies.sm (deleted)
• src/server/create.sm (modified) (7 diffs)
• src/server/io.sm (modified) (7 diffs)
• src/server/mirror.sm (deleted)
• src/server/module.mk.in (modified) (1 diff)
• src/server/prelude.sm (modified) (3 diffs)
• src/server/pvfs2-server-req.c (modified) (2 diffs)
• src/server/pvfs2-server.h (modified) (6 diffs)
• src/server/request-scheduler (modified) (1 prop)
• src/server/set-eattr.sm (modified) (6 diffs)
• src/server/unstuff.sm (modified) (1 diff)
• test/automated/README.tests (modified) (1 diff)
• test/automated/testscrpt.sh (modified) (3 diffs)
• test/client/mpi-io/module.mk.in (modified) (1 diff)
• test/client/mpi-io/mpi-io-test.c (modified) (18 diffs)
• test/common/gen-locks/module.mk.in (modified) (1 diff)
• test/common/gen-locks/test-null-lock.c (added)
• test/common/gen-locks/test-pthread-lock.c (added)
• test/common/id-generator/test.c (modified) (1 diff)
• test/configure (modified) (4 diffs)
• test/configure.in (modified) (2 diffs)
• test/io/bmi/bench-initialize.c (modified) (2 diffs)
• test/io/bmi/bench-initialize.h (modified) (1 diff)
• test/io/bmi/bench-mem.h (modified) (1 diff)
• test/io/bmi/module.mk.in (modified) (1 diff)
• test/io/bmi/pingpong.c (modified) (9 diffs)
• test/io/bmi/test-bmi-client-eagerbug.c (modified) (6 diffs)
• test/io/bmi/test-bmi-client-list.c (modified) (4 diffs)
• test/io/bmi/test-bmi-client.c (modified) (4 diffs)
• test/io/bmi/test-bmi-server-eagerbug.c (modified) (5 diffs)
• test/io/bmi/test-bmi-server-list.c (modified) (3 diffs)
• test/io/bmi/test-bmi-server.c (modified) (3 diffs)
• test/io/buffer/trove-init.c (modified) (4 diffs)
• test/io/description/test-zero-fill.c (modified) (35 diffs)
• test/io/flow/test-bmi-cache-client.c (modified) (2 diffs)
• test/io/flow/test-bmi-cache-server.c (modified) (2 diffs)
• test/io/flow/test-harness-client.c (modified) (2 diffs)
• test/io/flow/test-harness-server-trove.c (modified) (2 diffs)
• test/io/flow/test1-client.c (modified) (2 diffs)
• test/io/flow/test1-server.c (modified) (2 diffs)
• test/io/job/job-client-example.c (modified) (2 diffs)
• test/io/job/job-server-example.c (modified) (1 diff)
• test/io/job/module.mk.in (modified) (1 diff)
• test/io/job/trove-job-create-toy.c (modified) (1 diff)
• test/io/job/trove-job-ls.c (modified) (1 diff)
• test/io/job/trove-job-mkfs.c (modified) (2 diffs)
• test/io/job/trove-job-touch.c (modified) (2 diffs)
• test/io/trove/test-listio.c (modified) (3 diffs)
• test/io/trove/test-listio2.c (modified) (4 diffs)
• test/io/trove/test-listio3.c (modified) (4 diffs)
• test/io/trove/test-listio4.c (modified) (4 diffs)
• test/io/trove/test-listio5.c (modified) (4 diffs)
• test/io/trove/test-trove-cancel.c (modified) (6 diffs)
• test/io/trove/trove-bstream.c (modified) (5 diffs)
• test/io/trove/trove-create-stress.c (modified) (3 diffs)
• test/io/trove/trove-export.c (modified) (4 diffs)
• test/io/trove/trove-import.c (modified) (4 diffs)
• test/io/trove/trove-key-iterate.c (modified) (3 diffs)
• test/io/trove/trove-ls.c (modified) (5 diffs)
• test/io/trove/trove-mkdir.c (modified) (3 diffs)
• test/io/trove/trove-mkfs.c (modified) (1 diff)
• test/io/trove/trove-rm.c (modified) (4 diffs)
• test/io/trove/trove-rmdir.c (modified) (4 diffs)
• test/io/trove/trove-test.h (modified) (2 diffs)
• test/io/trove/trove-touch.c (modified) (3 diffs)
• test/perfbase/benchmarks/benchmark-utils.c (modified) (3 diffs)
• test/posix/module.mk.in (modified) (2 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/Makefile.in

@@ -11 +11 @@
 # publish        copy over documents to the PVFS.org web pags
 # admintools     builds admin tools
-# usertools      builds user tools
 # kernapps       builds userland helper programs for kernel driver
 # cscope         generates information for cscope utility
@@ -121 +120 @@
 #    here keeps make from accidentally doing too much work (see GNU
 #    make manual).
-.PHONY: all clean dist distclean docs docsclean publish cscope tags codecheck admintools kernapps usertools
+.PHONY: all clean dist distclean docs docsclean publish cscope tags codecheck admintools kernapps
 
 ################################################################
@@ -437 +436 @@
 # library
 ADMINSRC_SERVER :=
-# usRSRC is source code for userland programs
-USERSRC :=
 # LIBSRC is source code for libpvfs2
 LIBSRC :=
@@ -553 +550 @@
 # ADMINDEPENDS is a list of dependency files for admin programs
 ADMINDEPENDS := $(patsubst %.c,%.d, $(filter %.c,$(ADMINSRC)))
-#
-# USEROBJS is a list of user program objects
-USEROBJS := $(patsubst %.c,%.o, $(filter %.c,$(USERSRC)))
-# USERTOOLS is a list of user program executables 
-USERTOOLS := $(patsubst %.c,%, $(filter %.c, $(USERSRC)))
-# USERDEPENDS is a list of dependency files for user programs
-USERDEPENDS := $(patsubst %.c,%.d, $(filter %.c,$(USERSRC)))
 
 ifdef BUILD_SERVER
@@ -639 +629 @@
 else
 DEPENDS := $(sort $(LIBDEPENDS) $(SERVERDEPENDS) $(SERVERBINDEPENDS) \
-    $(MISCDEPENDS) $(USERDEPENDS) \
+    $(MISCDEPENDS) \
     $(ADMINDEPENDS) $(ADMINDEPENDS_SERVER) $(KERNAPPDEPENDS) $(VISDEPENDS) \
     $(VISMISCDEPENDS) $(KARMADEPENDS) $(STATECOMPDEPS) $(FUSEDEPENDS))
@@ -651 +641 @@
 all:: $(BMILIBRARIES)
 else
-all:: $(SERVER) $(KARMA) $(LIBRARIES) admintools usertools $(VISS) $(KARMA) $(FUSE)
+all:: $(SERVER) $(KARMA) $(LIBRARIES) admintools $(VISS) $(KARMA) $(FUSE)
 endif
 
 # target for building admin tools
 admintools: $(ADMINTOOLS) $(ADMINTOOLS_SERVER)
-#target for building user tools
-usertools: $(USERTOOLS)
 
 # target for building kernel driver userland programs
@@ -862 +850 @@
 $(ADMINTOOLS): %: %.o $(LIBRARIES)
 $(ADMINTOOLS_SERVER): %: %.o $(LIBRARIES) lib/libpvfs2-server.a
-$(USERTOOLS): %: %.o $(LIBRARIES)
 
 $(KERNAPPS): %: %.o $(LIBRARIES)
@@ -927 +914 @@
                 $(ADMINOBJS) $(ADMINOBJS_SERVER) $(ADMINTOOLS)\
                 $(ADMINTOOLS_SERVER) lib/libpvfs2-server.a\
-                $(USERTOOLS) $(USEROBJS) \
                 $(KERNAPPOBJS) $(KERNAPPS) $(KERNAPPSTHR) \
                 $(VISS) $(VISMISCOBJS) $(VISOBJS) $(VISDEPENDS)\
@@ -958 +944 @@
 bmidist: cleaner
         @sh $(srcdir)/maint/make-bmi-dist.sh $(srcdir) $(builddir) @PVFS2_VERSION@
-        cp -u $(builddir)/config.save $(builddir)/config.status
+        if test -f $(builddir)/config.save; then  cp -u $(builddir)/config.save $(builddir)/config.status; fi
 endif
 
@@ -973 +959 @@
         rm -f pvfs2-config.h.in~
         rm -f $(srcdir)/cscope.out $(srcdir)/cscope.files
-        cp -p config.status config.save
+        if test -f config.status; then cp -p config.status config.save; fi
         rm -f config.log config.status config.cache 
         rm -f pvfs-@PVFS2_VERSION@.tar.gz
@@ -1073 +1059 @@
         install -m 644 $(srcdir)/include/pvfs2-hint.h $(includedir)
         install -m 644 $(srcdir)/include/pvfs2-compat.h $(includedir)
-        install -m 644 $(srcdir)/include/pvfs2-mirror.h $(includedir)
 
         install -d $(libdir)
@@ -1108 +1093 @@
         install -d $(bindir)
         install -m 755 $(ADMINTOOLS) $(bindir)
-        install -m 755 $(USERTOOLS) $(bindir)
         # for compatibility in case anyone really wants "lsplus"
         $(LN_S) pvfs2-ls $(bindir)/pvfs2-lsplus
@@ -1115 +1099 @@
         install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(bindir)
         install -m 755 $(srcdir)/src/apps/admin/pvfs2-config-convert $(bindir)
-        install -m 755 $(srcdir)/src/apps/admin/pvfs2-getmattr $(bindir)
-        install -m 755 $(srcdir)/src/apps/admin/pvfs2-setmattr $(bindir)
 ifdef BUILD_KARMA
         install -m 755 $(KARMA) $(bindir)

branches/cu-security-branch/configure

@@ -1402 +1402 @@
 PVFS2_VERSION_MINOR=8
 PVFS2_VERSION_SUB=1
-#PVFS2_PRE=""
-PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
+PVFS2_PRE=""
+#PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
 
 PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB$PVFS2_VERSION_PRE

branches/cu-security-branch/configure.in

@@ -20 +20 @@
 PVFS2_VERSION_MINOR=8
 PVFS2_VERSION_SUB=1
-#PVFS2_PRE=""
-PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
+PVFS2_PRE=""
+#PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
 
 PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB$PVFS2_VERSION_PRE

branches/cu-security-branch/doc/coding/romio-MPICH2-0.96p2-PVFS2-0.51.diff

@@ -2141 +2141 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs.h,v 1.3 2002/10/24 17:00:57 gropp Exp $    
-+ *   $Id: ad_pvfs.h,v 1.5 2004/06/07 19:26:28 gropp Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2177 +2177 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs_flush.c,v 1.11 2003/04/18 20:15:01 David Exp $    
-+ *   $Id: ad_pvfs_flush.c,v 1.12 2004/05/20 19:05:17 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2225 +2225 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs_resize.c,v 1.11 2003/04/18 20:15:01 David Exp $    
-+ *   $Id: ad_pvfs_resize.c,v 1.13 2004/06/07 16:42:26 gropp Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2282 +2282 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_close.c,v 1.2 2003/06/27 23:23:16 robl Exp $
-+ *   $Id: ad_pvfs2_close.c,v 1.3 2004/05/20 19:13:57 robl Exp $
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2314 +2314 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_common.c,v 1.7 2003/09/05 20:43:58 robl Exp $
-+ *   $Id: ad_pvfs2_common.c,v 1.9 2004/03/25 22:17:45 robl Exp $
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *   Copyright (C) 2003 University of Chicago. 
@@ -2423 +2423 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*-
   * vim: ts=8 sts=4 sw=4 noexpandtab
-- *   $Id: ad_pvfs2_common.h,v 1.8 2003/09/18 23:13:18 robl Exp $    
-+ *   $Id: ad_pvfs2_common.h,v 1.10 2004/03/25 22:22:34 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2469 +2469 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_delete.c,v 1.5 2003/09/05 20:43:58 robl Exp $    
-+ *   $Id: ad_pvfs2_delete.c,v 1.8 2004/05/20 20:31:05 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 2003 University of Chicago. 
@@ -2547 +2547 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_fcntl.c,v 1.3 2003/08/05 22:59:20 robl Exp $    
-+ *   $Id: ad_pvfs2_fcntl.c,v 1.5 2004/05/20 20:31:05 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2588 +2588 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_flush.c,v 1.3 2003/10/30 18:53:40 robl Exp $    
-+ *   $Id: ad_pvfs2_flush.c,v 1.9 2004/05/20 20:31:05 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2655 +2655 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*-
   * vim: ts=8 sts=4 sw=4 noexpandtab
-- *   $Id: ad_pvfs2_open.c,v 1.11 2003/11/02 15:55:18 rross Exp $
-+ *   $Id: ad_pvfs2_open.c,v 1.14 2004/05/20 20:31:05 robl Exp $
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -2865 +2865 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_read.c,v 1.7 2003/08/07 23:34:31 robl Exp $
-+ *   $Id: ad_pvfs2_read.c,v 1.10 2004/06/07 20:48:15 robl Exp $
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -3640 +3640 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_pvfs2_resize.c,v 1.4 2003/09/04 23:20:09 robl Exp $
-+ *   $Id: ad_pvfs2_resize.c,v 1.10 2004/05/20 20:31:05 robl Exp $
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -3700 +3700 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- 
   *   vim: ts=8 sts=4 sw=4 noexpandtab
-- *   $Id: ad_pvfs2_write.c,v 1.11 2003/09/05 20:47:47 robl Exp $
-+ *   $Id: ad_pvfs2_write.c,v 1.13 2004/05/20 20:31:05 robl Exp $
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -3943 +3943 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_open.c,v 1.23 2003/09/05 22:35:49 gropp Exp $    
-+ *   $Id: ad_open.c,v 1.27 2004/05/20 07:43:36 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -4150 +4150 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ad_write_str.c,v 1.11 2003/07/26 23:16:57 David Exp $    
-+ *   $Id: ad_write_str.c,v 1.12 2003/12/16 21:51:22 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -4200 +4200 @@
 +/* -*- Mode: C; c-basic-offset:4 ; -*- */
 +/* 
-+ *   $Id: ad_write_str_naive.c,v 1.1 2003/12/16 21:51:23 robl Exp $
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
 + *
 + *   Copyright (C) 2001 University of Chicago. 
@@ -4583 +4583 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: flatten.c,v 1.12 2003/09/04 21:35:29 rross Exp $    
-+ *   $Id: flatten.c,v 1.14 2004/02/19 16:24:02 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5228 +5228 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: lock.c,v 1.10 2003/12/10 22:44:12 gropp Exp $    
-+ *   $Id: lock.c,v 1.11 2004/05/26 17:56:55 thakur Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5267 +5267 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: adio.h,v 1.30 2003/09/08 13:35:43 gropp Exp $    
-+ *   $Id: adio.h,v 1.35 2004/06/07 17:59:57 gropp Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5345 +5345 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: adioi.h,v 1.21 2003/12/04 22:20:06 robl Exp $    
-+ *   $Id: adioi.h,v 1.22 2003/12/17 16:49:52 robl Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5385 +5385 @@
 @@ -1,10 +1,10 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
--/*  $Id: mpipr.h,v 1.8 2003/09/08 13:36:43 gropp Exp $
-+/*  $Id: mpipr.h,v 1.9 2004/01/08 22:41:54 gropp Exp $
+-/*  $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
++/*  $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $
   *
   *  (C) 2001 by Argonne National Laboratory.
@@ -5524 +5524 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: mpio.h.in,v 1.20 2003/11/07 00:14:54 robl Exp $    
-+ *   $Id: mpio.h.in,v 1.25 2004/06/01 19:21:16 thakur Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5775 +5775 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: close.c,v 1.11 2003/07/01 19:12:39 robl Exp $    
-+ *   $Id: close.c,v 1.12 2004/04/06 18:46:31 thakur Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5816 +5816 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: delete.c,v 1.18 2003/09/15 13:33:30 gropp Exp $    
-+ *   $Id: delete.c,v 1.19 2004/02/12 06:08:22 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5902 +5902 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: get_posn_sh.c,v 1.17 2003/07/01 19:12:39 robl Exp $    
-+ *   $Id: get_posn_sh.c,v 1.18 2004/02/12 06:08:24 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -5971 +5971 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: get_view.c,v 1.15 2003/04/18 20:15:08 David Exp $    
-+ *   $Id: get_view.c,v 1.16 2004/02/12 06:08:26 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6026 +6026 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: ioreq_f2c.c,v 1.10 2003/02/24 23:52:08 robl Exp $    
-+ *   $Id: ioreq_f2c.c,v 1.11 2004/02/12 06:08:27 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6066 +6066 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: iread_sh.c,v 1.20 2003/07/01 19:12:40 robl Exp $    
-+ *   $Id: iread_sh.c,v 1.21 2004/02/12 06:08:29 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6324 +6324 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: mpioprof.h,v 1.9 2003/09/08 13:32:48 gropp Exp $    
-+ *   $Id: mpioprof.h,v 1.10 2004/05/28 23:05:41 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6412 +6412 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: open.c,v 1.32 2003/09/22 21:23:23 gropp Exp $    
-+ *   $Id: open.c,v 1.34 2004/05/19 23:55:09 thakur Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6630 +6630 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: read_alle.c,v 1.15 2003/09/08 13:35:04 gropp Exp $    
-+ *   $Id: read_alle.c,v 1.16 2004/02/12 06:08:42 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6696 +6696 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: read_at.c,v 1.20 2003/09/08 13:33:43 gropp Exp $    
-+ *   $Id: read_at.c,v 1.21 2004/02/12 06:08:44 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -6897 +6897 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: read_ordb.c,v 1.20 2003/09/25 13:25:11 gropp Exp $    
-+ *   $Id: read_ordb.c,v 1.21 2004/02/12 06:08:49 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7063 +7063 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: read_orde.c,v 1.15 2003/09/08 13:35:04 gropp Exp $    
-+ *   $Id: read_orde.c,v 1.16 2004/02/12 06:08:51 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7118 +7118 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: read_sh.c,v 1.19 2003/09/15 13:33:31 gropp Exp $    
-+ *   $Id: read_sh.c,v 1.20 2004/02/12 06:08:53 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7292 +7292 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: seek_sh.c,v 1.18 2003/09/15 13:33:31 gropp Exp $    
-+ *   $Id: seek_sh.c,v 1.19 2004/02/12 06:09:02 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7522 +7522 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: set_errh.c,v 1.11 2003/04/18 20:15:12 David Exp $    
-+ *   $Id: set_errh.c,v 1.12 2003/12/16 17:32:34 thakur Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7561 +7561 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: wr_atallb.c,v 1.16 2003/09/05 22:33:57 gropp Exp $    
-+ *   $Id: wr_atallb.c,v 1.17 2004/02/12 06:09:09 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7713 +7713 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: wr_atalle.c,v 1.16 2003/09/08 13:35:05 gropp Exp $    
-+ *   $Id: wr_atalle.c,v 1.17 2004/02/12 06:09:10 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7779 +7779 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: write_allb.c,v 1.15 2003/09/05 22:34:31 gropp Exp $    
-+ *   $Id: write_allb.c,v 1.16 2004/02/12 06:09:12 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7916 +7916 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: write_alle.c,v 1.15 2003/09/05 22:34:32 gropp Exp $    
-+ *   $Id: write_alle.c,v 1.18 2004/03/17 20:31:27 gropp Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -7984 +7984 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: write_at.c,v 1.20 2003/09/08 21:29:22 gropp Exp $    
-+ *   $Id: write_at.c,v 1.21 2004/02/12 06:09:15 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -8183 +8183 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: write_ordb.c,v 1.20 2003/09/25 13:25:11 gropp Exp $    
-+ *   $Id: write_ordb.c,v 1.21 2004/02/12 06:09:17 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -8351 +8351 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: write_orde.c,v 1.15 2003/09/08 13:35:05 gropp Exp $    
-+ *   $Id: write_orde.c,v 1.16 2004/02/12 06:09:19 David Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 
@@ -8417 +8417 @@
  /* -*- Mode: C; c-basic-offset:4 ; -*- */
  /* 
-- *   $Id: write_sh.c,v 1.19 2003/09/15 13:33:36 gropp Exp $    
-+ *   $Id: write_sh.c,v 1.21 2004/02/20 19:47:59 gropp Exp $    
+- *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
++ *   $Id: romio-MPICH2-0.96p2-PVFS2-0.51.diff,v 1.2 2009/06/11 15:49:22 nlmills Exp $    
   *
   *   Copyright (C) 1997 University of Chicago. 

branches/cu-security-branch/doc/design/concepts.tex

@@ -24 +24 @@
 \maketitle
 
-\begin{verbatim}$Id: concepts.tex,v 1.3.20.2 2009-09-02 20:15:50 nlmills Exp $\end{verbatim}
+\begin{verbatim}$Id: concepts.tex,v 1.3.20.3 2010-05-21 17:33:53 nlmills Exp $\end{verbatim}
 \section{Introduction}
 

branches/cu-security-branch/doc/design/handle-allocator.tex

@@ -22 +22 @@
 \begin{document}
 \maketitle
-\begin{verbatim}$Id: handle-allocator.tex,v 1.1.72.2 2009-09-02 20:15:50 nlmills Exp $\end{verbatim}
+\begin{verbatim}$Id: handle-allocator.tex,v 1.1.72.3 2010-05-21 17:33:53 nlmills Exp $\end{verbatim}
 
 \section{Introduction}

branches/cu-security-branch/include/pvfs2-debug.h

@@ -76 +76 @@
 #define GOSSIP_DIRECTIO_DEBUG          ((uint64_t)1 << 54)
 #define GOSSIP_MGMT_DEBUG              ((uint64_t)1 << 55)
-#define GOSSIP_MIRROR_DEBUG            ((uint64_t)1 << 56)
-#define GOSSIP_SECURITY_DEBUG          ((uint64_t)1 << 57)
-#define GOSSIP_GETCRED_DEBUG           ((uint64_t)1 << 58)
+#define GOSSIP_SECURITY_DEBUG          ((uint64_t)1 << 56)
+#define GOSSIP_GETCRED_DEBUG           ((uint64_t)1 << 57)
 
 /* NOTE: if you want your gossip flag to be controllable from 

branches/cu-security-branch/include/pvfs2-sysint.h

@@ -462 +462 @@
     void *user_ptr);
 
-#define PVFS_isys_read(x1,x2,x3,x4,x5,x6,y,x7,x8,x9) \
-PVFS_isys_io(x1,x2,x3,x4,x5,x6,y,PVFS_IO_READ,x7,x8,x9)
-
-#define PVFS_isys_write(x1,x2,x3,x4,x5,x6,y,x7,x8,x9) \
-PVFS_isys_io(x1,x2,x3,x4,x5,x6,y,PVFS_IO_WRITE,x7,x8,x9)
+#define PVFS_isys_read(x1,x2,x3,x4,x5,x6,y,x7,x8) \
+PVFS_isys_io(x1,x2,x3,x4,x5,x6,y,PVFS_IO_READ,x7,x8)
+
+#define PVFS_isys_write(x1,x2,x3,x4,x5,x6,y,x7,x8) \
+PVFS_isys_io(x1,x2,x3,x4,x5,x6,y,PVFS_IO_WRITE,x7,x8)
 
 PVFS_error PVFS_sys_io(

branches/cu-security-branch/include/pvfs2-types.h

@@ -7 +7 @@
  * please update the PVFS2_PROTO_VERSION in pvfs2-req-proto.h accordingly
  */
+
 /** \file
  *
@@ -369 +370 @@
 #define PVFS_ATTR_SYS_ALL_TIMES \
 ((PVFS_ATTR_SYS_COMMON_ALL-PVFS_ATTR_SYS_TYPE) | PVFS_ATTR_SYS_ATIME_SET | PVFS_ATTR_SYS_MTIME_SET)
+
+
+/* Extended attribute flags */
+#define PVFS_XATTR_CREATE  0x1
+#define PVFS_XATTR_REPLACE 0x2
 
 /* Extended attribute flags */
@@ -441 +447 @@
 #define PVFS_MAX_XATTR_VALUELEN  8192 /* Not the same as XATTR_SIZE_MAX defined
                                         by <linux/xattr.h> */ 
-#define PVFS_MAX_XATTR_LISTLEN   8  /* Not the same as XATTR_LIST_MAX
+#define PVFS_MAX_XATTR_LISTLEN   8    /* Not the same as XATTR_LIST_MAX
                                           defined by <linux/xattr.h> */
 

branches/cu-security-branch/module.mk.in

@@ -1 +1 @@
 # This file is used by "make dist" to pass along parameters
 # to the Makefile in release snapshots
+DIST_RELEASE = 1

branches/cu-security-branch/src/apps/admin/pvfs2-cp.c

@@ -328 +328 @@
         "\n-s <strip_size>\t\t\tsize of access to PVFS2 volume"
         "\n-n <num_datafiles>\t\tnumber of PVFS2 datafiles to use"
-        "\n-b <buffer_size in bytes>\thow much data to read/write at once"
+        "\n-b <buffer_size>\t\thow much data to read/write at once"
         "\n-t\t\t\t\tprint some timing information"
         "\n-v\t\t\t\tprint version number and exit\n");

branches/cu-security-branch/src/apps/admin/pvfs2-genconfig

@@ -158 +158 @@
     #
     @components = $inputline =~ /(?:,?[ ]*([^{,]+(?:{[^}]+})?[^,]*))/g;
-    foreach my $comp_ws (@components)
-    {
-        my $comp;
-
-        # Trim leading and trailing whitespace
-        $comp = $comp_ws;
-        $comp =~ s/^\s+//;
-        $comp =~ s/\s+$//;
-
+    foreach my $comp (@components)
+    {
         # if we've got a component that has {..}, then expand.
         # match the prefix (hostname) and curly brackets

branches/cu-security-branch/src/apps/admin/pvfs2-xattr.c

@@ -3 +3 @@
  * 
  * See COPYING in top-level directory.
- *
- * 03/19/07 - Added set and get for user.pvfs2.mirror.mode and ..mirror.copies.
- *            Added get for user.pvfs2.mirror.handles and ..mirror.status
  */
 
@@ -30 +27 @@
 #include "xattr-utils.h"
 
-#include "pvfs2-mirror.h"
-
 #define VALBUFSZ 1024
 
@@ -47 +42 @@
 struct options
 {
-    PVFS_ds_keyval *key;
-    PVFS_ds_keyval *val;
+    PVFS_ds_keyval key;
+    PVFS_ds_keyval val;
     char* srcfile;
-    int get, text, key_count;
+    int get, text;
 };
 
@@ -85 +80 @@
 static struct options* parse_args(int argc, char* argv[]);
 static int generic_open(file_object *obj);
-
-static int pvfs2_eattr(int get
-                      ,file_object      *obj
-                      ,PVFS_ds_keyval   *key_p
-                      ,PVFS_ds_keyval   *val_p
-                      ,int key_count); 
-
+static int pvfs2_eattr(int get, file_object *, PVFS_ds_keyval *key_p,
+        PVFS_ds_keyval *val_p);
 static void usage(int argc, char** argv);
 static int resolve_filename(file_object *obj, char *filename);
@@ -147 +137 @@
       return -1;
   }
-
-  if (!eattr_is_prefixed(user_opts->key[0].buffer))
-  {
-      fprintf(stderr, "extended attribute key is not prefixed %s\n"
-                    , (char *) user_opts->key[0].buffer);
+  if (!eattr_is_prefixed(user_opts->key.buffer))
+  {
+      fprintf(stderr, "extended attribute key is not prefixed %s\n", (char *) user_opts->key.buffer);
       return -1;
   }
   if (!user_opts->get)
   {
-      if (!permit_set(&user_opts->key[0]))
+      if (!permit_set(&user_opts->key))
       {
-          fprintf(stderr, "Not permitted to set key %s\n"
-                        , (char *) user_opts->key[0].buffer);
+          fprintf(stderr, "Not permitted to set key %s\n", (char *) user_opts->key.buffer);
           return -1;
       }
-      if (modify_val(&user_opts->key[0], &user_opts->val[0]) < 0)
+      if (modify_val(&user_opts->key, &user_opts->val) < 0)
       {
-          fprintf(stderr, "Invalid value for user-settable attribute %s, %s\n"
-                        , (char *) user_opts->key[0].buffer
-                        , (char *) user_opts->val[0].buffer);
+          fprintf(stderr, "Invalid value for user-settable hint %s, %s\n", (char *) user_opts->key.buffer, (char *) user_opts->val.buffer);
           return -1;
       }
   }
 
-    ret = pvfs2_eattr(user_opts->get
-                     ,&src
-                     ,user_opts->key
-                     ,user_opts->val
-                     ,user_opts->key_count);
-    if (ret != 0) 
-    {
-        return ret;
-    }
-    if (user_opts->get && user_opts->text)  
-    {
-        if (strncmp(user_opts->key[0].buffer
-                   ,"user.pvfs2.meta_hint"
-                   ,SPECIAL_METAFILE_HINT_KEYLEN) == 0) {
-            PVFS_metafile_hint *hint = 
-                            (PVFS_metafile_hint *) user_opts->val[0].buffer;
-            printf("Metafile hints");
-            if (hint->flags & PVFS_IMMUTABLE_FL) {
-                printf(" :immutable file ");
-            }
-            if (hint->flags & PVFS_APPEND_FL) {
-                printf(" :Append-only file ");
-            }
-            if (hint->flags & PVFS_NOATIME_FL) {
-                printf(" :Atime updates disabled");
-            }
-            printf("\n");
-        } else if ( strncmp(user_opts->key[0].buffer
-                           ,"user.pvfs2.mirror.handles"
-                           ,sizeof("user.pvfs2.mirror.handles")) == 0)
-        {
-             PVFS_handle *myHandles = (PVFS_handle *)user_opts->val[0].buffer;
-             int copies = *(int *)user_opts->val[1].buffer;
-             int dfile_count = src.u.pvfs2.attr.dfile_count;
-             for (i=0; i<(copies * dfile_count); i++)
-             {
-                 printf("Handle(%d):%llu\n",i,llu(myHandles[i]));
-             }
-        } else if ( strncmp(user_opts->key[0].buffer
-                           ,"user.pvfs2.mirror.copies"
-                           ,sizeof("user.pvfs2.mirror.copies")) == 0)
-        {
-             int *myCopies = (int *)user_opts->val[0].buffer;
-             printf("Number of Mirrored Copies : %d\n",*myCopies);
-        } else if ( strncmp(user_opts->key[0].buffer
-                           ,"user.pvfs2.mirror.status"
-                           ,sizeof("user.pvfs2.mirror.status")) == 0)
-        {
-             int copies = *(int *)user_opts->val[1].buffer;
-             int dfile_count = src.u.pvfs2.attr.dfile_count;
-             PVFS_handle *status = (PVFS_handle *)user_opts->val[0].buffer;
-             for (i=0; i<(dfile_count * copies); i++)
-                 printf("src handle(%d) : status(%s) : value(%llu)\n"
-                       ,i
-                       ,status[i]==0?"usable":"UNusable"
-                       ,llu(status[i]));
-        } else if ( strncmp(user_opts->key[0].buffer
-                           ,"user.pvfs2.mirror.mode"
-                           , sizeof("user.pvfs2.mirror.mode")) == 0)
-        {
-             printf("Mirroring Mode : ");
-             switch(*(MIRROR_MODE *)user_opts->val[0].buffer)
-             {
-                case NO_MIRRORING :
-                {
-                    printf("Turned OFF\n");
-                    break;
-                }
-                case MIRROR_ON_IMMUTABLE :
-                {
-                    printf("Create Mirror when IMMUTABLE is set\n");
-                    break;
-                }
-                default:
-                {
-                    printf("Unknown mode(%d)\n"
-                          ,*(int *)user_opts->val[0].buffer);
-                    break;
-                }
-             }/*end switch*/
-        } else {
-            printf("key : \"%s\" \tValue : \"%s\"\n",
-                    (char *)user_opts->key[0].buffer,
-                    (char *)user_opts->val[0].buffer);
-        }
-    }
+  ret = pvfs2_eattr(user_opts->get, &src, &user_opts->key, &user_opts->val);
+  if (ret != 0) 
+  {
+      return ret;
+  }
+  if (user_opts->get && user_opts->text)  
+  {
+      if (strncmp(user_opts->key.buffer, "user.pvfs2.meta_hint", SPECIAL_METAFILE_HINT_KEYLEN) == 0) {
+          PVFS_metafile_hint *hint = (PVFS_metafile_hint *) user_opts->val.buffer;
+          printf("Metafile hints: ");
+          if (hint->flags & PVFS_IMMUTABLE_FL) {
+              printf("immutable file ");
+          }
+          if (hint->flags & PVFS_APPEND_FL) {
+              printf("Append-only file ");
+          }
+          if (hint->flags & PVFS_NOATIME_FL) {
+              printf("Atime updates disabled.");
+          }
+          printf("\n");
+      } else {
+          printf("key:%s Value:\n%s\n",
+                 (char *)user_opts->key.buffer,
+                 (char *)user_opts->val.buffer);
+      }
+  }
+
+  for (i = 0; i < ncreds; i++)
+  {
+      PINT_cleanup_credential(&creds[i]);
+  }
+  free(creds);
   PVFS_sys_finalize();
   return(ret);
@@ -263 +194 @@
 static int modify_val(PVFS_ds_keyval *key_p, PVFS_ds_keyval *val_p)
 {
-    if (strncmp(key_p->buffer,"user.pvfs2.meta_hint"
-                             , SPECIAL_METAFILE_HINT_KEYLEN) == 0)
+    if (strncmp(key_p->buffer, "user.pvfs2.meta_hint", SPECIAL_METAFILE_HINT_KEYLEN) == 0)
     {
         PVFS_metafile_hint hint;
@@ -284 +214 @@
         memcpy(val_p->buffer, &hint, sizeof(hint));
         val_p->buffer_sz = sizeof(hint);
-        gossip_err("From xattr, My key value is %llu.\n",
-                 llu(hint.flags));
-    } else if (strncmp(key_p->buffer,"user.pvfs2.mirror.mode"
-                                    ,sizeof("user.pvfs2.mirror.mode")) == 0)
-    {
-       printf("Setting mirror mode to %d\n",*(int *)val_p->buffer);
-    } else if (strncmp(key_p->buffer,"user.pvfs2.mirror.copies"
-                                    ,sizeof("user.pvfs2.mirror.mode")) == 0)
-    {
-       printf("Setting number of mirrored copies to %d\n"
-             ,*(int *)val_p->buffer);
-    }
-
-
+    }
     return 0;
 }
@@ -316 +233 @@
  * returns zero on success and negative one on failure
  */
-static int pvfs2_eattr(int get
-                      ,file_object      *obj
-                      ,PVFS_ds_keyval   *key_p
-                      ,PVFS_ds_keyval   *val_p
-                      ,int key_count) 
+static int pvfs2_eattr(int get, file_object *obj, PVFS_ds_keyval *key_p,
+        PVFS_ds_keyval *val_p) 
 {
   int ret = -1;
@@ -329 +243 @@
       {
 #ifndef HAVE_FGETXATTR_EXTRA_ARGS
-        if ((ret = fgetxattr(obj->u.ufs.fd
-                            ,key_p->buffer
-                            ,val_p->buffer
-                            ,val_p->buffer_sz)) < 0)
+        if ((ret = fgetxattr(obj->u.ufs.fd, key_p->buffer, val_p->buffer, val_p->buffer_sz)) < 0)
 #else
-        if ((ret = fgetxattr(obj->u.ufs.fd
-                            ,key_p->buffer
-                            ,val_p->buffer
-                            ,val_p->buffer_sz 
-                            ,0
-                            ,0)) < 0)
+        if ((ret = fgetxattr(obj->u.ufs.fd, key_p->buffer, val_p->buffer, val_p->buffer_sz, 0, 0)) < 0)
 #endif
         {
@@ -366 +272 @@
   else
   {
-      if (get == 1 && key_count == 1)
+      if (get == 1)
       {
-          ret = PVFS_sys_geteattr(obj->u.pvfs2.ref, obj->u.pvfs2.cred, key_p, val_p, NULL);
-      } else if (get == 1 && key_count == 2)
-      {
-          PVFS_sysresp_geteattr *resp = malloc(sizeof(*resp));
-          if (!resp)
-          {
-             fprintf(stderr,"Unable to allocate resp structure.\n");
-             exit(EXIT_FAILURE);
-          }
-          memset(resp,0,sizeof(*resp));
-          resp->val_array = val_p;
-          resp->err_array = malloc(2 * sizeof(PVFS_error));
-          if (!resp->err_array)
-          {
-             fprintf(stderr,"Unable to allocate err_array.\n");
-             exit(EXIT_FAILURE);
-          }
-          memset(resp->err_array,0,sizeof(2 * sizeof(PVFS_error)));
-          
-          ret = PVFS_sys_geteattr_list(obj->u.pvfs2.ref
-                                      ,obj->u.pvfs2.cred
-                                      ,key_count
-                                      ,key_p
-                                      ,resp
-                                      ,NULL );
-      } else {
-          ret = PVFS_sys_seteattr(obj->u.pvfs2.ref, obj->u.pvfs2.cred, key_p, val_p, 0, NULL);
+          ret = PVFS_sys_geteattr(obj->u.pvfs2.ref, obj->u.pvfs2.cred, 
+                                  key_p, val_p, NULL);
+      }
+      else {
+          ret = PVFS_sys_seteattr(obj->u.pvfs2.ref, obj->u.pvfs2.cred, 
+                                  key_p, val_p, 0, NULL);
       }
 
@@ -427 +312 @@
     memset(tmp_opts, 0, sizeof(struct options));
 
-    /*create one key structure*/
-    tmp_opts->key = malloc(sizeof(PVFS_ds_keyval));
-    if (!tmp_opts->key)
-    {
-        fprintf(stderr,"Unable to allocate tmp_opts->key.\n");
-        exit(EXIT_FAILURE);
-    }
-    memset(tmp_opts->key,0,sizeof(PVFS_ds_keyval));
-
-    /*create one val structure*/
-    tmp_opts->val = malloc(sizeof(PVFS_ds_keyval));
-    if (!tmp_opts->val)
-    {
-        fprintf(stderr,"Unable to allocate tmp_opts->val.\n");
-        exit(EXIT_FAILURE);
-    }
-    memset(tmp_opts->val,0,sizeof(PVFS_ds_keyval));
-
-    /*set default key_count*/
-    tmp_opts->key_count = 1;
-
     /* fill in defaults */
+    memset(&tmp_opts->key, 0, sizeof(PVFS_ds_keyval));
+    memset(&tmp_opts->val, 0, sizeof(PVFS_ds_keyval));
     tmp_opts->srcfile = strdup(argv[argc-1]);
     tmp_opts->get = 1;
@@ -463 +329 @@
                 break;
             case 'k':
-                tmp_opts->key[0].buffer = strdup(optarg);
-                tmp_opts->key[0].buffer_sz = strlen(tmp_opts->key[0].buffer) + 1;
+                tmp_opts->key.buffer = strdup(optarg);
+                tmp_opts->key.buffer_sz = strlen(tmp_opts->key.buffer) + 1;
                 break;
             case 'v':
-                if (strncmp(tmp_opts->key[0].buffer
-                           ,"user.pvfs2.mirror.mode"
-                           ,sizeof("user.pvfs2.mirror.mode")) == 0 ||
-                    strncmp(tmp_opts->key[0].buffer
-                           ,"user.pvfs2.mirror.copies"
-                           ,sizeof("user.pvfs2.mirror.copies")) == 0)
-                { /*convert string argument into numeric argument*/
-                  tmp_opts->val[0].buffer = malloc(sizeof(int));
-                  if (!tmp_opts->val[0].buffer)
-                  {
-                     printf("Unable to allocate memory for key value.\n");
-                     exit(EXIT_FAILURE);
-                  }
-                  memset(tmp_opts->val[0].buffer,0,sizeof(int));
-                  *(int *)tmp_opts->val[0].buffer = atoi(optarg);
-                  tmp_opts->val[0].buffer_sz = sizeof(int);
-                  break;
-                } else {
-                  tmp_opts->val[0].buffer = strdup(optarg);
-                  tmp_opts->val[0].buffer_sz = strlen(tmp_opts->val[0].buffer);
-                  break;
-                }
+                tmp_opts->val.buffer = strdup(optarg);
+                tmp_opts->val.buffer_sz = strlen(tmp_opts->val.buffer) + 1;
+                break;
             case('?'):
                 printf("?\n");
@@ -495 +342 @@
         }
     }
-
-    /*ensure that the given mode is supported by PVFS*/
-    if (!tmp_opts->get &&
-         strcmp(tmp_opts->key[0].buffer,"user.pvfs2.mirror.mode") == 0)
-    {
-       if (*(int *)tmp_opts->val[0].buffer < BEGIN_MIRROR_MODE ||
-           *(int *)tmp_opts->val[0].buffer > END_MIRROR_MODE )
-       {
-          fprintf(stderr,"Invalid Mirror Mode ==> %d\n"
-                         "\tValid Modes\n"
-                         "\t1. %d == No Mirroring\n"
-                         "\t2. %d == Mirroring on Immutable\n"
-                        ,*(int *)tmp_opts->val[0].buffer
-                        ,NO_MIRRORING,MIRROR_ON_IMMUTABLE);
-
-          exit(EXIT_FAILURE);
-       }
-    }
-
     if (tmp_opts->get == 1)
     {
-        /*if user wants mirror.handles or mirror.status, then we must also */
-        /*retrieve the number of copies, so we know how to display the     */
-        /*information properly.                                            */
-        if (strcmp(tmp_opts->key[0].buffer,"user.pvfs2.mirror.handles") == 0 ||
-            strcmp(tmp_opts->key[0].buffer,"user.pvfs2.mirror.status") == 0 )
-        {
-           tmp_opts->key_count = 2;
-           PVFS_ds_keyval *myKeys = malloc(tmp_opts->key_count * 
-                                           sizeof(PVFS_ds_keyval));
-           if (!myKeys)
-           {
-               fprintf(stderr,"Unable to allocate myKeys.\n");
-               exit(EXIT_FAILURE);
-           }
-           memset(myKeys,0,sizeof(tmp_opts->key_count *
-                                  sizeof(PVFS_ds_keyval)));
-           myKeys[0] = *tmp_opts->key;
-           myKeys[1].buffer = strdup("user.pvfs2.mirror.copies");
-           myKeys[1].buffer_sz = sizeof("user.pvfs2.mirror.copies");
-           free(tmp_opts->key);
-           tmp_opts->key = myKeys;
-        }/*end if handles or status*/
-
-        
-
-        tmp_opts->val[0].buffer = calloc(1, VALBUFSZ);
-        if (!tmp_opts->val[0].buffer)
-        {
-           fprintf(stderr,"Unable to allocate tmp_opts->val[0].buffer.\n");
-           exit(EXIT_FAILURE);
-        }
-        tmp_opts->val[0].buffer_sz = VALBUFSZ;
-        
-        if (tmp_opts->key_count == 2)
-        {
-           PVFS_ds_keyval *myVals = malloc(tmp_opts->key_count * 
-                                           sizeof(PVFS_ds_keyval));
-           if (!myVals)
-           {
-               fprintf(stderr,"Unable to allocate myVals.\n");
-               exit(EXIT_FAILURE);
-           }
-           memset(myVals,0,sizeof(tmp_opts->key_count *
-                                  sizeof(PVFS_ds_keyval)));
-           myVals[0] = *tmp_opts->val;
-           free(tmp_opts->val);
-
-           myVals[1].buffer = malloc(sizeof(int));
-           if (!myVals[1].buffer)
-           {
-              fprintf(stderr,"Unable to allocate myVals[1].buffer.\n");
-              exit(EXIT_FAILURE);
-           }
-           myVals[1].buffer_sz = sizeof(int);
-           tmp_opts->val = myVals;
-         }/*end if*/  
-    } else {
-        if (tmp_opts->val[0].buffer == NULL)
-        {
-            fprintf(stderr, "Please specify value if setting extended "
-                            "attributes\n");
+        tmp_opts->val.buffer = calloc(1, VALBUFSZ);
+        tmp_opts->val.buffer_sz = VALBUFSZ;
+        if (tmp_opts->val.buffer == NULL)
+        {
+            fprintf(stderr, "Could not allocate val\n");
+            exit(EXIT_FAILURE);
+        }
+    }
+    else {
+        if (tmp_opts->val.buffer == NULL)
+        {
+            fprintf(stderr, "Please specify value if setting extended attributes\n");
             usage(argc, argv);
             exit(EXIT_FAILURE);
         }
     }
-    if (tmp_opts->key[0].buffer == NULL)
+    if (tmp_opts->key.buffer == NULL)
     {
         fprintf(stderr, "Please specify key if getting extended attributes\n");
@@ -593 +372 @@
 static void usage(int argc, char** argv)
 {
-    fprintf(stderr,"Usage: %s -s {set xattrs} -k <key> -v <val> "
-                   "-t {print attributes} filename\n",argv[0]);
+    fprintf(stderr,"Usage: %s -s {set xattrs} -k <key> -v <val> -t {print attributes} filename\n",argv[0]);
     return;
 }

branches/cu-security-branch/src/apps/fuse/pvfs2fuse.c

@@ -10 +10 @@
  *           Sumit Narayan
  *
- *   $Date: 2009-09-02 20:15:54 $
- *   $Revision: 1.3.28.2 $
+ *   $Date: 2010-05-21 17:33:57 $
+ *   $Revision: 1.3.28.3 $
  *
  *   Documentation: http://www.engr.uconn.edu/~sun03001/docs/pvfs2fuse-rpt.pdf
  */
 
-/* char *pvfs2fuse_version = "$Id: pvfs2fuse.c,v 1.3.28.2 2009-09-02 20:15:54 nlmills Exp $"; */
+/* char *pvfs2fuse_version = "$Id: pvfs2fuse.c,v 1.3.28.3 2010-05-21 17:33:57 nlmills Exp $"; */
 char *pvfs2fuse_version = "0.01";
 
@@ -1048 +1048 @@
                      {
                          fprintf(stderr, "PVFS2FUSE requires mountpoint as argument\n");
-                         abort();
+                         abort()
                      }
 

branches/cu-security-branch/src/client/sysint/client-state-machine.h

@@ -40 +40 @@
  * send or receive request messages.
  */
-#ifndef PVFS2_CLIENT_JOB_BMI_TIMEOUT_DEFAULT
 #define PVFS2_CLIENT_JOB_BMI_TIMEOUT_DEFAULT 30
-#endif
 
 /* Default number of times to retry restartable client operations. */

branches/cu-security-branch/src/client/sysint/mgmt-iterate-handles-list.sm

@@ -182 +182 @@
     foreach_msgpair(&sm_p->msgarray_op, msg_p, i)
     {
-skipped:
+
         /* skip servers that have already reached end */
         /* TODO: use a better #define or something for ITERATE_END */
-        if(sm_p->u.iterate_handles_list.position_array[j]
+        if(sm_p->u.iterate_handles_list.position_array[i]
             == PVFS_ITERATE_END)
         {
             sm_p->msgarray_op.count--;
-            sm_p->u.iterate_handles_list.handle_count_array[j] = 0;
-            j++;
-            goto skipped;
+            sm_p->u.iterate_handles_list.handle_count_array[i] = 0;
         }
         else
@@ -199 +197 @@
                 capability,
                 sm_p->u.iterate_handles_list.fs_id,
-                sm_p->u.iterate_handles_list.handle_count_array[j],
-                sm_p->u.iterate_handles_list.position_array[j],
+                sm_p->u.iterate_handles_list.handle_count_array[i],
+                sm_p->u.iterate_handles_list.position_array[i],
                 sm_p->u.iterate_handles_list.flags,
                 sm_p->hints);
+            j++;
             msg_p->fs_id = sm_p->u.iterate_handles_list.fs_id;
             msg_p->handle = PVFS_HANDLE_NULL;
             msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
             msg_p->comp_fn = iterate_handles_list_comp_fn;
-            msg_p->svr_addr = sm_p->u.iterate_handles_list.addr_array[j];
-            j++;
+            msg_p->svr_addr = sm_p->u.iterate_handles_list.addr_array[i];
         }
     }

branches/cu-security-branch/src/client/sysint/sys-io.sm

@@ -444 +444 @@
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
-
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     if (PINT_smcb_cancelled(smcb))
@@ -795 +794 @@
 
         cur_ctx->session_tag = PINT_util_get_next_tag();
+
         cur_ctx->msg_recv_has_been_posted = 0;
         cur_ctx->msg_recv_in_progress = 0;

branches/cu-security-branch/src/client/sysint/sys-set-eattr.sm

@@ -80 +80 @@
     {
         int i = 0;
-        int j; char *valBuf = (char *)val_array[i].buffer;
-        gossip_debug(GOSSIP_SETEATTR_DEBUG,"Setting extended attributes:\n");
+        gossip_debug(GOSSIP_SETEATTR_DEBUG,
+                     "Setting extended attributes:\n");
         for(; i < nkey; ++i)
         {
-            gossip_debug(GOSSIP_SETEATTR_DEBUG,"eattr[%d]: key=%s\n"
-                                              , i
-                                              ,(char *)key_array[i].buffer);
-            for (j=0; j<val_array[i].buffer_sz; j++)
-                gossip_debug(GOSSIP_SETEATTR_DEBUG,"          val[%d]=%#x\n"
-                                                  ,j
-                                                  ,(unsigned int)valBuf[j]);
-        }/*end for*/
-    } /*end if*/
+            gossip_debug(GOSSIP_SETEATTR_DEBUG,
+                         "eattr[%d]: key=%s val=%.*s\n",
+                         i, (char *)key_array[i].buffer,
+                         val_array[i].buffer_sz, (char *)val_array[i].buffer);
+        }
+    }
 
     if ((ref.handle == PVFS_HANDLE_NULL) ||

branches/cu-security-branch/src/common/events/debug.h

@@ -1 +1 @@
 /*************************************
  * File         : debug.h
- * Version      : $Id: debug.h,v 1.2.30.2 2009-09-02 20:15:57 nlmills Exp $
+ * Version      : $Id: debug.h,v 1.2.30.3 2010-05-21 17:34:01 nlmills Exp $
  ************************************/
 

branches/cu-security-branch/src/common/events/fmt_fsm.c

@@ -1 +1 @@
 /*****************************************************
  * File    : fmt_fsm.cpp   
- * Version : $Id: fmt_fsm.c,v 1.2.30.2 2009-09-02 20:15:57 nlmills Exp $
+ * Version : $Id: fmt_fsm.c,v 1.2.30.3 2010-05-21 17:34:01 nlmills Exp $
  ****************************************************/
 

branches/cu-security-branch/src/common/events/fmt_fsm.h

@@ -1 +1 @@
 /*****************************************************
  * File    : fmt_fsm.h   
- * Version : $Id: fmt_fsm.h,v 1.2.30.2 2009-09-02 20:15:57 nlmills Exp $
+ * Version : $Id: fmt_fsm.h,v 1.2.30.3 2010-05-21 17:34:01 nlmills Exp $
  ****************************************************/
 
@@ -222 +222 @@
 /***************************************************************************
  * $RCSfile: fmt_fsm.h,v $   $Author: nlmills $
- * $Revision: 1.2.30.2 $   $Date: 2009-09-02 20:15:57 $
+ * $Revision: 1.2.30.3 $   $Date: 2010-05-21 17:34:01 $
  ***************************************************************************/

branches/cu-security-branch/src/common/events/pvfs_tau_api.c

@@ -1 +1 @@
 /*****************************************************
  * File    : pvfs_tau_api.cpp 
- * Version : $Id: pvfs_tau_api.c,v 1.2.30.2 2009-09-02 20:15:57 nlmills Exp $
+ * Version : $Id: pvfs_tau_api.c,v 1.2.30.3 2010-05-21 17:34:01 nlmills Exp $
  ****************************************************/
 

branches/cu-security-branch/src/common/events/pvfs_tau_api.h

@@ -1 +1 @@
 /*****************************************************
  * File    : pvfs_tau_api.h 
- * Version : $Id: pvfs_tau_api.h,v 1.2.30.2 2009-09-02 20:15:57 nlmills Exp $
+ * Version : $Id: pvfs_tau_api.h,v 1.2.30.3 2010-05-21 17:34:01 nlmills Exp $
  ****************************************************/
 

branches/cu-security-branch/src/common/misc/msgpairarray.h

@@ -49 +49 @@
     /* server address */
     PVFS_BMI_addr_t svr_addr;
-
-    /*session identifier between send and rcvs*/
-    /*note:  server-side i/o machine uses the session_tag as the flow */
-    /*descriptor tag.                                                 */
-    bmi_msg_tag_t session_tag;
 
     /* req and encoded_req are used to send a request */

branches/cu-security-branch/src/common/misc/msgpairarray.sm

@@ -94 +94 @@
     int i = 0;
     PINT_sm_msgpair_state *msg_p = NULL;
-
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing msgpairarray_init...\n");
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tbase frame:%d\tframe count:%d\n"
-                                    ,smcb->base_frame,smcb->frame_count);
 
     gossip_debug(GOSSIP_MSGPAIR_DEBUG, "(%p) msgpairarray state: init "
@@ -250 +246 @@
         session_tag = PINT_util_get_next_tag();
 
-        /*store the session tag for this msgpair, so the msgpair completion */
-        /*function can pass it to the caller of msgpairarray.               */
-        msg_p->session_tag = session_tag;
-
         gossip_debug(GOSSIP_MSGPAIR_DEBUG, "%s: sm %p msgpair %d: "
                      "posting recv\n", __func__, smcb, i);
@@ -497 +489 @@
     gossip_debug(GOSSIP_MSGPAIR_DEBUG, "(%p) msgpairarray state: "
                  "completion_fn\n", smcb);
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing msgpairarray_completion_fn..\n");
 
     for (i = 0; i < mop->count; i++)
@@ -555 +546 @@
         if (msg_p->comp_fn != NULL)
         {
-            gossip_debug(GOSSIP_MIRROR_DEBUG,"\texecuting msg_p->comp_fn..\n");
             /* If we call the completion function, store the result on
              * a per message pair basis.  Also store some non-zero

branches/cu-security-branch/src/common/misc/pint-cached-config.c

@@ -1788 +1788 @@
 }
 
-/* PINT_cached_config_server_names()
- *
- * Returns a list of pointers to the IO server names currently running in this   
- * file system.
- *
- * returns 0 on success, -PVFS_error on failure
- */
-int PINT_cached_config_io_server_names( char ***list
-                                      , int *size
-                                      , PVFS_fs_id fsid)
-{
-    int i;
-    struct qlist_head *hash_link = NULL;
-    struct config_fs_cache_s *cur_config_cache = NULL;
-
-    assert(PINT_fsid_config_cache_table);
-
-    hash_link = qhash_search(PINT_fsid_config_cache_table,&(fsid));
-    if(!hash_link)
-    {
-        return(-PVFS_ENOENT);
-    }
-
-    cur_config_cache = qlist_entry(
-        hash_link, struct config_fs_cache_s, hash_link);
-
-    assert(cur_config_cache);
-
-    *size = cur_config_cache->io_server_count;
-
-    *list = malloc(sizeof(char *) * (*size));
-
-    if (! (*list) )
-       return(-PVFS_ENOMEM);
-
-    memset(*list,0,sizeof(char *) * (*size));
-
-    for (i=0; i<(*size); i++)
-    {
-        /*addr_string originates from the alias mapping->bmi_address*/
-        (*list)[i] = cur_config_cache->io_server_array[i].addr_string;
-    }
-
-   return(0);
-}
-
 /*
  * Local variables:

branches/cu-security-branch/src/common/misc/pint-cached-config.h

@@ -136 +136 @@
     struct server_configuration_s *config);
 
-int PINT_cached_config_io_server_names(
-    char ***list, 
-    int *size,
-    PVFS_fs_id fsid);
-
 #endif /* __PINT_CACHED_CONFIG_H */
 

branches/cu-security-branch/src/common/misc/pvfs2-debug.c

@@ -117 +117 @@
     /* Debug the bstream code */
     { "bstream", GOSSIP_BSTREAM_DEBUG },
-    /* Debug mirroring operations */
-    { "mirror",GOSSIP_MIRROR_DEBUG },
     /* Debug trove in direct io mode */
     {"directio", GOSSIP_DIRECTIO_DEBUG},

branches/cu-security-branch/src/common/misc/pvfs2-internal.h

@@ -94 +94 @@
 #define SPECIAL_METAFILE_HINT_KEYSTR    "meta_hint\0"
 #define SPECIAL_METAFILE_HINT_KEYLEN    21
-#define SPECIAL_MIRROR_PARAMS_KEYSTR    "mirror\0"
-#define SPECIAL_MIRROR_PARAMS_KEYLEN    18
 
 #define IO_MAX_REGIONS 64

branches/cu-security-branch/src/common/misc/pvfs2-util.c

@@ -559 +559 @@
         *tmp = 0;
         mntent->mnt_opts = strdup("rw");
-        mntent->fs_id = PVFS_FS_ID_NULL;
         return &s_stat_tab_array[0];
     }

branches/cu-security-branch/src/common/misc/state-machine.h

@@ -50 +50 @@
     SM_RUN     = 9
 };
-
-/*define msgpairarray parameters for server-to-server requests*/
-#define PINT_serv_init_msgarray_params(sm_p, __fsid)             \
-do {                                                             \
-   PINT_sm_msgpair_params *mpp = &sm_p->msgarray_op.params;      \
-   struct server_configuration_s *server_config =                \
-        get_server_config_struct();                              \
-   mpp->job_context = server_job_context;                        \
-   if (server_config)                                            \
-   {                                                             \
-      mpp->job_timeout = server_config->client_job_bmi_timeout;  \
-      mpp->retry_limit = server_config->client_retry_limit;      \
-      mpp->retry_delay = server_config->client_retry_delay_ms;   \
-   }                                                             \
-   else                                                          \
-   {                                                             \
-      mpp->job_timeout = PVFS2_CLIENT_JOB_BMI_TIMEOUT_DEFAULT;   \
-      mpp->retry_limit = PVFS2_CLIENT_RETRY_LIMIT_DEFAULT;       \
-      mpp->retry_delay = PVFS2_CLIENT_RETRY_DELAY_MS_DEFAULT;    \
-   }                                                             \
-} while (0)                                                      
 
 /* these define things like stack size and so forth for the common
@@ -225 +204 @@
                         int *remaining);
 
-/* This macro is used in calls to PINT_sm_frame() */
+/* This macro is used in calls to PINT_sm_fram() */
 #define PINT_FRAME_CURRENT 0
-#define PINT_FRAME_TOP 1
 
 struct PINT_state_machine_s pvfs2_void_sm;

branches/cu-security-branch/src/common/misc/str-utils.c

@@ -144 +144 @@
 
     /* initialize our starting position */
-    if (*inout_segp == NULL)
-    {
-        ptr = pathname;
-    }
-    else if (*opaquep != NULL)
-    {
-        /* replace the '/', point just past it */
-        ptr = (char *) *opaquep;
-        *ptr = '/';
-        ptr++;
-    }
-    else
-        return -1; /* NULL *opaquep indicates last segment returned last time */
+    if (*inout_segp == NULL) {
+        ptr = pathname;
+    }
+    else if (*opaquep != NULL) {
+        /* replace the '/', point just past it */
+        ptr = (char *) *opaquep;
+        *ptr = '/';
+        ptr++;
+    }
+    else return -1; /* NULL *opaquep indicates last segment returned last time */
 
     /* at this point, the string is back in its original state */
 
     /* jump past separators */
-    while ((*ptr != '\0') && (*ptr == '/'))
-        ptr++;
-    if (*ptr == '\0')
-        return -1; /* all that was left was trailing '/'s */
+    while ((*ptr != '\0') && (*ptr == '/')) ptr++;
+    if (*ptr == '\0') return -1; /* all that was left was trailing '/'s */
 
     *inout_segp = ptr;
 
     /* find next separator */
-    while ((*ptr != '\0') && (*ptr != '/'))
-        ptr++;
-    if (*ptr == '\0')
-        *opaquep = NULL; /* indicate last segment */
-    else
-    {
-        /* terminate segment and save position of terminator */
-        *ptr = '\0';
-        *opaquep = ptr;
+    while ((*ptr != '\0') && (*ptr != '/')) ptr++;
+    if (*ptr == '\0') *opaquep = NULL; /* indicate last segment */
+    else {
+        /* terminate segment and save position of terminator */
+        *ptr = '\0';
+        *opaquep = ptr;
     }
     return 0;
@@ -320 +312 @@
     for(i =0; i < pathlen; i++)
     {
-        if (path[i] == '/')
-        {
-                 num_slashes_seen++;
-            if (num_slashes_seen > skip)
-            {
-                break;
-            }
-        }
+        if (path[i] == '/')
+        {
+            num_slashes_seen++;
+            if (num_slashes_seen > skip)
+            {
+                break;
+            }
+        }
     }
 
@@ -364 +356 @@
     if (!comma_list || !tokens)
     {
-        return (0);
+        return (0);
     }
 
@@ -371 +363 @@
     while ((holder = index(holder, ',')))
     {
-        tokencount++;
-        holder++;
+        tokencount++;
+        holder++;
     }
 
@@ -388 +380 @@
     if (!(*tokens))
     {
-        return 0;
+        return 0;
     }
 
     if(1 == tokencount)
     {
-        (*tokens)[0] = strdup(comma_list);
-        if(!(*tokens)[0])
-        {
-            tokencount = 0;
-            goto failure;
-        }
-        return tokencount;
+        (*tokens)[0] = strdup(comma_list);
+        if(!(*tokens)[0])
+        {
+            tokencount = 0;
+            goto failure;
+        }
+        return tokencount;
     }
 
@@ -407 +399 @@
     for (i = 0; i < tokencount && holder; i++)
     {
-        holder2 = index(holder, ',');
-        if (!holder2)
-        {
-            holder2 = end;
-        }
+        holder2 = index(holder, ',');
+        if (!holder2)
+        {
+            holder2 = end;
+        }
         if (holder2 - holder == 0) {
             retval--;
-            return (retval);
-        }
-        (*tokens)[i] = (char *) malloc((holder2 - holder) + 1);
-        if (!(*tokens)[i])
-        {
-            goto failure;
-        }
-        strncpy((*tokens)[i], holder, (holder2 - holder));
-        (*tokens)[i][(holder2 - holder)] = '\0';
+            goto out;
+        }
+        (*tokens)[i] = (char *) malloc((holder2 - holder) + 1);
+        if (!(*tokens)[i])
+        {
+            goto failure;
+        }
+        strncpy((*tokens)[i], holder, (holder2 - holder));
+        (*tokens)[i][(holder2 - holder)] = '\0';
         assert(strlen((*tokens)[i]) != 0);
-        holder = holder2 + 1;
-    }
-
+        holder = holder2 + 1;
+    }
+
+out:
     return (retval);
 
-failure:
+  failure:
 
     /* free up any memory we allocated if we failed */
     if (*tokens)
     {
-        for (i = 0; i < tokencount; i++)
-        {
-            if ((*tokens)[i])
-            {
-                free((*tokens)[i]);
-            }
-        }
-        free(*tokens);
+        for (i = 0; i < tokencount; i++)
+        {
+            if ((*tokens)[i])
+            {
+                free((*tokens)[i]);
+            }
+        }
+        free(*tokens);
     }
     return (0);

branches/cu-security-branch/src/common/quicklist/quicklist.h

@@ -118 +118 @@
 {
     return head->next == head;
-}
-
-/**
- * qlist_pop - pop the first item off the list and return it
- * @head: qlist to modify
- */
-static __inline__ struct qlist_head* qlist_pop(struct qlist_head *head)
-{
-    struct qlist_head *item = NULL;
-
-    if (!qlist_empty(head))
-    {
-        item = head->next;
-        qlist_del(item);
-    }
-
-    return item;
 }
 

branches/cu-security-branch/src/io/bmi/bmi-method-callback.h

@@ -12 +12 @@
 BMI_addr_t bmi_method_addr_reg_callback(bmi_method_addr_p map);
 int bmi_method_addr_forget_callback(BMI_addr_t addr);
-void bmi_method_addr_drop_callback(char *method_name);
 
 #endif /* __BMI_METHOD_CALLBACK_H */

branches/cu-security-branch/src/io/bmi/bmi.c

@@ -50 +50 @@
     struct qlist_head link;
     BMI_addr_t addr;
-};
-
-/*
- * BMI trigger to reap all method resources for inactive addresses.
- */
-static QLIST_HEAD(bmi_addr_force_drop_list);
-static gen_mutex_t bmi_addr_force_drop_list_mutex = GEN_MUTEX_INITIALIZER;
-struct drop_item
-{
-    struct qlist_head link;
-    char  *method_name;
 };
 
@@ -133 +122 @@
     int flags);
 static void bmi_addr_drop(ref_st_p tmp_ref);
-static void bmi_addr_force_drop(ref_st_p ref, ref_list_p ref_list);
 static void bmi_check_forget_list(void);
-static void bmi_check_addr_force_drop (void);
 
 /** Initializes the BMI layer.  Must be called before any other BMI
@@ -980 +967 @@
     /* figure out if we need to drop any stale addresses */
     bmi_check_forget_list();
-    bmi_check_addr_force_drop();
 
     gen_mutex_lock(&active_method_count_mutex);
@@ -1992 +1978 @@
 
     return (0);
-}
-
-/*
- * Signal BMI to drop inactive connections for this method.
- */
-void bmi_method_addr_drop_callback (char* method_name)
-{
-    struct drop_item *item =
-        (struct drop_item *) malloc(sizeof(struct drop_item));
-
-    /*
-     * If we can't allocate, just return.
-     * Maybe this will succeed next time.
-     */
-    if (!item) return;
-
-    item->method_name = method_name;
-    
-    gen_mutex_lock(&bmi_addr_force_drop_list_mutex);
-    qlist_add(&item->link, &bmi_addr_force_drop_list);
-    gen_mutex_unlock(&bmi_addr_force_drop_list_mutex);
-
-    return;
 }
 
@@ -2257 +2220 @@
 }
 
-
-/* bmi_addr_force_drop
- *
- * Destroys a complete BMI address, including forcing the method to clean up 
- * its portion.
- *
- * NOTE: must be called with ref list mutex held 
- */
-static void bmi_addr_force_drop(ref_st_p ref, ref_list_p ref_list)
-{
-    gossip_debug(GOSSIP_BMI_DEBUG_CONTROL,
-                 "[BMI CONTROL]: %s: bmi discarding address: %llu\n",
-                 __func__, llu(ref->bmi_addr));
-
-    ref_list_rem(ref_list, ref->bmi_addr);
-    dealloc_ref_st(ref);
-
-    return;
-}
-
-/*
- * bmi_check_addr_force_drop
- *
- * Checks to see if any method has requested freeing resources.
- */
-static void bmi_check_addr_force_drop (void)
-{
-    struct drop_item *drop_item = NULL;
-    ref_st_p          ref_item = NULL;
-
-    gen_mutex_lock(&bmi_addr_force_drop_list_mutex);
-    while (!qlist_empty(&bmi_addr_force_drop_list))
-    {
-        drop_item = qlist_entry(qlist_pop(&bmi_addr_force_drop_list),
-                                struct drop_item,
-                                link);
-        gen_mutex_unlock(&bmi_addr_force_drop_list_mutex);
-        gen_mutex_lock(&ref_mutex);
-        qlist_for_each_entry(ref_item, cur_ref_list, list_link)
-        {
-             if ((ref_item->ref_count == 0) &&
-                 (ref_item->interface->method_name == drop_item->method_name))
-             {
-                 bmi_addr_force_drop(ref_item, cur_ref_list);
-             }
-        }
-        gen_mutex_unlock(&ref_mutex);
-        gen_mutex_lock(&bmi_addr_force_drop_list_mutex);
-    }
-    gen_mutex_unlock(&bmi_addr_force_drop_list_mutex);
-
-    return;
-}
-
 /*
  * Local variables:

branches/cu-security-branch/src/io/bmi/bmi_tcp/bmi-tcp.c

@@ -3649 +3649 @@
             (errno == ENONET) ||
             (errno == EHOSTUNREACH) ||
-            (errno == EOPNOTSUPP) ||
-            (errno == ENETUNREACH) ||
-            (errno == ENFILE) ||
-            (errno == EMFILE))
+            (errno == EOPNOTSUPP) || (errno == ENETUNREACH))
         {
             /* try again later */
-            if ((errno == ENFILE) || (errno == EMFILE))
-            {
-                gossip_err("Error: accept: %s (continuing)\n",strerror(errno));
-                bmi_method_addr_drop_callback(BMI_tcp_method_name);
-            }
             return (0);
         }

branches/cu-security-branch/src/io/bmi/bmi_tcp/socket-collection-epoll.c

@@ -129 +129 @@
     memset(status, 0, (sizeof(int) * incount));
 
-    if(incount == 0)
-    {
-        return(0);
-    }
-
     /* actually do the epoll_wait() here */
     do

branches/cu-security-branch/src/io/description/pint-request.c

@@ -111 +111 @@
                 temp_space = (void *)malloc(sizeof(PINT_Request_state)+
                                 (sizeof(PINT_reqstack)*req->cur->rqbase->depth));
-                if(!temp_space)
-                {
-                   return -PVFS_ENOMEM;
-                }
+        if(!temp_space)
+        {
+            return -PVFS_ENOMEM;
+        }
 
                 memcpy(temp_space,req,sizeof(PINT_Request_state));
@@ -165 +165 @@
                 /* do we allow external setting of LOGICAL_SKIP */
                 /* what about backwards skipping, as in seeking? */
-        }
+    }
         
         /* we should be ready to begin */
@@ -174 +174 @@
         {
                 if (req->cur[req->lvl].rq)
-            {
+                {
                 /* print the current state of the decoding process */
                 gossip_debug(GOSSIP_REQUEST_DEBUG,"\tDo seq of %lld ne %d st %lld nb %d "
@@ -189 +189 @@
                                 lld(req->type_offset), lld(req->target_offset),
                                 lld(req->final_offset));
-               if (mem) /* if a mem type is specified print its state */
-               {
+            if (mem) /* if a mem type is specified print its state */
+            {
                 gossip_debug(GOSSIP_REQUEST_DEBUG,"\t\tmto %lld mta %lld mfi %lld\n",
                        lld(mem->type_offset), lld(mem->target_offset),
                        lld(mem->final_offset));
-               }
-             }
+            }
+                }
                 /* NULL type indicates packed data - handle directly */
                 if (req->cur[req->lvl].rq == NULL)

branches/cu-security-branch/src/io/job/job-desc-queue.h

@@ -31 +31 @@
 {
     TROVE_op_id id;
-    PVFS_size *out_size_p;
+    PVFS_size actual_size;
     PVFS_vtag *vtag;
     PVFS_fs_id fsid;

branches/cu-security-branch/src/io/job/job.c

@@ -1400 +1400 @@
 }
 
+/* job_trove_bstream_write_at()
+ *
+ * storage byte stream write
+ *
+ * returns 0 on success, 1 on immediate completion, and -errno on
+ * failure
+ */
+int job_trove_bstream_write_at(PVFS_fs_id coll_id,
+                               PVFS_handle handle,
+                               PVFS_offset offset,
+                               void *buffer,
+                               PVFS_size size,
+                               PVFS_ds_flags flags,
+                               PVFS_vtag * vtag,
+                               void *user_ptr,
+                               job_aint status_user_tag,
+                               job_status_s * out_status_p,
+                               job_id_t * id,
+                               job_context_id context_id,
+                               PVFS_hint hints)
+{
+    /* post a trove write.  If it completes (or fails) immediately, then
+     * return and fill in the status structure.  If it needs to be tested
+     * for completion later, then queue up a job_desc structure.
+     */
+    int ret = -1;
+    struct job_desc *jd = NULL;
+    void* user_ptr_internal;
+
+    /* create the job desc first, even though we may not use it.  This
+     * gives us somewhere to store the BMI id and user ptr
+     */
+    jd = alloc_job_desc(JOB_TROVE);
+    if (!jd)
+    {
+        out_status_p->error_code = -PVFS_ENOMEM;
+        return 1;
+    }
+    jd->hints = hints;
+    jd->job_user_ptr = user_ptr;
+    jd->u.trove.actual_size = size;
+    jd->u.trove.vtag = vtag;
+    jd->context_id = context_id;
+    jd->status_user_tag = status_user_tag;
+    jd->trove_callback.fn = trove_thread_mgr_callback;
+    jd->trove_callback.data = (void*)jd;
+    user_ptr_internal = &jd->trove_callback;
+
+#ifdef __PVFS2_TROVE_SUPPORT__
+    ret = trove_bstream_write_at(coll_id, handle, buffer,
+                                 &jd->u.trove.actual_size, offset, flags,
+                                 jd->u.trove.vtag, user_ptr_internal,
+                                 global_trove_context,
+                                 &(jd->u.trove.id), hints);
+#else
+    gossip_err("Error: Trove support not enabled.\n");
+    ret = -ENOSYS;
+#endif
+
+    if (ret < 0)
+    {
+        /* error posting trove operation */
+        dealloc_job_desc(jd);
+        jd = NULL;
+        out_status_p->error_code = ret;
+        out_status_p->status_user_tag = status_user_tag;
+        return (1);
+    }
+
+    if (ret == 1)
+    {
+        /* immediate completion */
+        out_status_p->error_code = 0;
+        out_status_p->status_user_tag = status_user_tag;
+        out_status_p->actual_size = jd->u.trove.actual_size;
+        out_status_p->vtag = jd->u.trove.vtag;
+        dealloc_job_desc(jd);
+        jd = NULL;
+        return (ret);
+    }
+
+    /* if we fall through to this point, the job did not
+     * immediately complete and we must queue up to test later
+     */
+    *id = jd->job_id;
+    trove_pending_count++;
+
+    return (0);
+}
+
 int job_trove_bstream_write_list(TROVE_coll_id coll_id,
                                  TROVE_handle handle,
@@ -1438 +1528 @@
     jd->hints = hints;
     jd->u.trove.vtag = vtag;
-    jd->u.trove.out_size_p = out_size_p;
     jd->context_id = context_id;
     jd->status_user_tag = status_user_tag;
@@ -1477 +1566 @@
         out_status_p->error_code = 0;
         out_status_p->status_user_tag = status_user_tag;
-        out_status_p->actual_size = *out_size_p;
+        out_status_p->actual_size = jd->u.trove.actual_size;
         out_status_p->vtag = jd->u.trove.vtag;
         dealloc_job_desc(jd);
@@ -1492 +1581 @@
     return (0);
 } 
+
+
+/* job_trove_bstream_read_at()
+ *
+ * storage byte stream read 
+ *
+ * returns 0 on success, 1 on immediate completion, and -errno on
+ * failure
+ */
+int job_trove_bstream_read_at(PVFS_fs_id coll_id,
+                              PVFS_handle handle,
+                              PVFS_offset offset,
+                              void *buffer,
+                              PVFS_size size,
+                              PVFS_ds_flags flags,
+                              PVFS_vtag * vtag,
+                              void *user_ptr,
+                              job_aint status_user_tag,
+                              job_status_s * out_status_p,
+                              job_id_t * id,
+                              job_context_id context_id,
+                              PVFS_hint hints)
+{
+    /* post a trove read.  If it completes (or fails) immediately, then
+     * return and fill in the status structure.  If it needs to be tested
+     * for completion later, then queue up a job_desc structure.
+     */
+    int ret = -1;
+    struct job_desc *jd = NULL;
+    void* user_ptr_internal;
+
+    /* create the job desc first, even though we may not use it.  This
+     * gives us somewhere to store the BMI id and user ptr
+     */
+    jd = alloc_job_desc(JOB_TROVE);
+    if (!jd)
+    {
+        out_status_p->error_code = -PVFS_ENOMEM;
+        return 1;
+    }
+    jd->hints = hints;
+    jd->job_user_ptr = user_ptr;
+    jd->u.trove.actual_size = size;
+    jd->u.trove.vtag = vtag;
+    jd->context_id = context_id;
+    jd->status_user_tag = status_user_tag;
+    jd->trove_callback.fn = trove_thread_mgr_callback;
+    jd->trove_callback.data = (void*)jd;
+    user_ptr_internal = &jd->trove_callback;
+
+#ifdef __PVFS2_TROVE_SUPPORT__
+    ret = trove_bstream_read_at(coll_id, handle, buffer,
+                                &jd->u.trove.actual_size, offset, flags,
+                                jd->u.trove.vtag, user_ptr_internal,
+                                global_trove_context,
+                                &(jd->u.trove.id), hints);
+#else
+    gossip_err("Error: Trove support not enabled.\n");
+    ret = -ENOSYS;
+#endif
+
+    if (ret < 0)
+    {
+        /* error posting trove operation */
+        dealloc_job_desc(jd);
+        jd = NULL;
+        out_status_p->error_code = ret;
+        out_status_p->status_user_tag = status_user_tag;
+        return (1);
+    }
+
+    if (ret == 1)
+    {
+        /* immediate completion */
+        out_status_p->error_code = 0;
+        out_status_p->status_user_tag = status_user_tag;
+        out_status_p->actual_size = jd->u.trove.actual_size;
+        out_status_p->vtag = jd->u.trove.vtag;
+        dealloc_job_desc(jd);
+        jd = NULL;
+        return (ret);
+    }
+
+    /* if we fall through to this point, the job did not
+     * immediately complete and we must queue up to test later
+     */
+    *id = jd->job_id;
+    trove_pending_count++;
+
+    return (0);
+}
 
 int job_trove_bstream_read_list(PVFS_fs_id coll_id,
@@ -1531 +1711 @@
     jd->job_user_ptr = user_ptr;
     jd->u.trove.vtag = vtag;
-    jd->u.trove.out_size_p = out_size_p;
     jd->context_id = context_id;
     jd->status_user_tag = status_user_tag;
@@ -1568 +1747 @@
         out_status_p->error_code = 0;
         out_status_p->status_user_tag = status_user_tag;
-        out_status_p->actual_size = *out_size_p;
+        out_status_p->actual_size = jd->u.trove.actual_size;
         out_status_p->vtag = jd->u.trove.vtag;
         dealloc_job_desc(jd);
@@ -4976 +5155 @@
     case JOB_TROVE:
         status->error_code = jd->u.trove.state;
-        if(jd->u.trove.out_size_p)
-            status->actual_size = *jd->u.trove.out_size_p;
+        status->actual_size = jd->u.trove.actual_size;
         status->vtag = jd->u.trove.vtag;
         status->coll_id = jd->u.trove.fsid;

branches/cu-security-branch/src/io/job/job.h

@@ -33 +33 @@
     job_aint status_user_tag;   /* tag supplied by caller */
     int error_code;             /* returned by all operations */
-    PVFS_size actual_size;      /* resize, bmi_recv */
+    PVFS_size actual_size;      /* read_at, write_at, resize, bmi_recv */
     PVFS_vtag *vtag;            /* most trove operations */
     PVFS_ds_position position;  /* iterate, iterate_keys, iterate_handles */
@@ -227 +227 @@
 
 /* storage byte stream write */
+int job_trove_bstream_write_at(PVFS_fs_id coll_id,
+                               PVFS_handle handle,
+                               PVFS_offset offset,
+                               void *buffer,
+                               PVFS_size size,
+                               PVFS_ds_flags flags,
+                               PVFS_vtag * vtag,
+                               void *user_ptr,
+                               job_aint status_user_tag,
+                               job_status_s * out_status_p,
+                               job_id_t * id,
+                               job_context_id context_id,
+                               PVFS_hint hints);
+
 int job_trove_bstream_write_list(PVFS_fs_id coll_id,
                                  PVFS_handle handle,
@@ -247 +261 @@
 
 /* storage byte stream read */
+int job_trove_bstream_read_at(PVFS_fs_id coll_id,
+                              PVFS_handle handle,
+                              PVFS_offset offset,
+                              void *buffer,
+                              PVFS_size size,
+                              PVFS_ds_flags flags,
+                              PVFS_vtag * vtag,
+                              void *user_ptr,
+                              job_aint status_user_tag,
+                              job_status_s * out_status_p,
+                              job_id_t * id,
+                              job_context_id context_id,
+                              PVFS_hint hints);
 
 int job_trove_bstream_read_list(PVFS_fs_id coll_id,

branches/cu-security-branch/src/io/trove/trove-dbpf/dbpf-bstream-direct.c

@@ -858 +858 @@
                 goto cache_put;
             }
-            if(qop_p->op.flags & TROVE_SYNC)
-            {
-                sync_required = 1;
-            }
+            sync_required = 1;
         }
         gen_mutex_unlock(&dbpf_update_size_lock);

branches/cu-security-branch/src/io/trove/trove-dbpf/dbpf-bstream.c

@@ -187 +187 @@
                     goto error_in_cleanup;
                 }
-                if(op_p->flags & TROVE_SYNC)
-                {
-                    sync_required = 1;
-                }
+                sync_required = 1;
             }
             gen_mutex_unlock(&dbpf_update_size_lock);

branches/cu-security-branch/src/io/trove/trove-dbpf/dbpf-dspace.c

@@ -887 +887 @@
                sizeof_attr != sizeof(attr))
             {
-                gossip_err("Warning: got invalid handle or key size in dbpf_dspace_iterate_handles().\n");
-                gossip_err("Warning: skipping entry.\n");
-                i--;
-                continue;
+                /* something is wrong with the result */
+                ret = -TROVE_EINVAL;
+                goto return_error;
             }
 
@@ -906 +905 @@
          * return
          */
-        sizeof_handle = sizeof(TROVE_handle);
-        sizeof_attr = sizeof(attr);
-        do
-        {
-            /* verify sizes are correct */
-            if(sizeof_handle != sizeof(TROVE_handle) ||
-               sizeof_attr != sizeof(attr))
-            {
-                gossip_err("Warning: got invalid handle or key size in dbpf_dspace_iterate_handles().\n");
-                gossip_err("Warning: skipping entry.\n");
-            }
-            DB_MULTIPLE_KEY_NEXT(tmp_ptr, &data,
-                                 tmp_handle, sizeof_handle,
-                                 tmp_attr, sizeof_attr);
-            if(!tmp_ptr)
-            {
-                goto get_next;
-            }
-        } while (sizeof_handle != sizeof(TROVE_handle) ||
-           sizeof_attr != sizeof(attr));
+        DB_MULTIPLE_KEY_NEXT(tmp_ptr, &data,
+                             tmp_handle, sizeof_handle,
+                             tmp_attr, sizeof_attr);
+        if(!tmp_ptr)
+        {
+            goto get_next;
+        }
+
+        /* verify sizes are correct */
+        if(sizeof_handle != sizeof(TROVE_handle) ||
+           sizeof_attr != sizeof(attr))
+        {
+            /* something is wrong with the result */
+            ret = -TROVE_EINVAL;
+            goto return_error;
+        }
 
         *op_p->u.d_iterate_handles.position_p = *(TROVE_handle *)tmp_handle;

branches/cu-security-branch/src/kernel/linux-2.6/namei.c

@@ -201 +201 @@
     if (inode && !is_bad_inode(inode))
     {
+        struct dentry *res;
         gossip_debug(GOSSIP_NAME_DEBUG, "%s:%s:%d Found good inode [%lu] with count [%d]\n", 
             __FILE__, __func__, __LINE__, inode->i_ino, (int)atomic_read(&inode->i_count));
-        struct dentry *res;
 
         /* update dentry/inode pair into dcache */

branches/cu-security-branch/src/kernel/linux-2.6/pvfs2-utils.c

@@ -668 +668 @@
 #define DIRENT_KEY  "system.pvfs2." DIRECTORY_ENTRY_KEYSTR
 
+/* Extended attributes helper functions */
+static char *xattr_non_zero_terminated[] = {
+    DFILE_KEY,
+    DIST_KEY,
+    ROOT_KEY,
+};
+
+/* Extended attributes helper functions */
+
+/*
+ * this function returns 
+ * 0 if the val corresponding to name is known to be not terminated with an explicit \0
+ * 1 if the val corresponding to name is known to be \0 terminated
+ */
+static int xattr_zero_terminated(const char *name)
+{
+    int i;
+    static int xattr_count = sizeof(xattr_non_zero_terminated)/sizeof(char *);
+    for (i = 0;i < xattr_count; i++)
+    {
+        if (strcmp(name, xattr_non_zero_terminated[i]) == 0)
+            return 0;
+    }
+    return 1;
+}
+
 static char *xattr_resvd_keys[] = {
     DFILE_KEY,
@@ -765 +791 @@
         if (ret == 0)
         {
+            ssize_t new_length;
             length = new_op->downcall.resp.getxattr.val_sz;
+            /*
+             * if the xattr corresponding to name was not terminated with a \0
+             * then we return the entire response length
+             */
+            if (xattr_zero_terminated(name) == 0)
+            {
+                new_length = length;
+            }
+            /*
+             * if it was terminated by a \0 then we return 1 less for the getfattr
+             * programs to play nicely with displaying it
+             */
+            else {
+                new_length = length - 1;
+            }
+            /* Just return the length of the queried attribute after
+             * subtracting the \0 thingie */
             if (size == 0)
             {
-                ret = length;
+                ret = new_length;
             }
             else
             {
-                /* check to see if val length is > provided buffer size */
-                if (length > size)
+                /* check to see if key length is > provided buffer size */
+                if (new_length > size)
                 {
                     ret = -ERANGE;
@@ -782 +826 @@
                     memset(buffer, 0, size);
                     memcpy(buffer, new_op->downcall.resp.getxattr.val, 
-                           length);
-                    ret = length; 
-                    gossip_debug(GOSSIP_XATTR_DEBUG,"pvfs2_inode_getxattr: "
-                        "inode %llu key %s key_sz %d, val_length %d\n", 
+                            new_length);
+                    ret = new_length;
+                    gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_getxattr: inode %llu key %s "
+                            " key_sz %d, val_length %d\n", 
                         llu(get_handle_from_ino(inode)),
                         (char*)new_op->upcall.req.getxattr.key, 
@@ -795 +839 @@
         {
             ret = -ENODATA; /* if no such keys exists we set this to be errno */
-            gossip_debug(GOSSIP_XATTR_DEBUG,"pvfs2_inode_getxattr: inode %llu "
-                                            "key %s does not exist!\n"
-                                      ,llu(get_handle_from_ino(inode))
-                                      ,(char *)new_op->upcall.req.getxattr.key);
+            gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_getxattr: inode %llu key %s does not exist!\n",
+                    llu(get_handle_from_ino(inode)), (char *) new_op->upcall.req.getxattr.key);
         }
 
@@ -819 +861 @@
     pvfs2_kernel_op_t *new_op = NULL;
     pvfs2_inode_t *pvfs2_inode = NULL;
-    int i;
-    char *valBuf;
 
     if (size < 0 || size >= PVFS_MAX_XATTR_VALUELEN || flags < 0)
@@ -896 +936 @@
             ret + 1;
         memcpy(new_op->upcall.req.setxattr.keyval.val, value, size);
-        new_op->upcall.req.setxattr.keyval.val_sz = size;
-
-        gossip_debug(GOSSIP_XATTR_DEBUG,"Upcall: size=%d\n"
-                    ,new_op->upcall.req.setxattr.keyval.val_sz);
-        valBuf = (char *)new_op->upcall.req.setxattr.keyval.val;
-        for (i=0; i<new_op->upcall.req.setxattr.keyval.val_sz; i++)
-            gossip_debug(GOSSIP_XATTR_DEBUG,"\tval[%d]=%#x\n"
-                        ,i
-                        ,(unsigned int)valBuf[i]);
-
-        gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_setxattr: key %s, "
-                "key_sz %d value size %zd\n", 
+        new_op->upcall.req.setxattr.keyval.val[size] = '\0';
+        /* For some reason, val_sz should include the \0 at the end as well */
+        new_op->upcall.req.setxattr.keyval.val_sz = size + 1;
+
+        gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_setxattr: key %s, key_sz %d "
+                " value size %zd\n", 
                  (char*)new_op->upcall.req.setxattr.keyval.key, 
                  (int) new_op->upcall.req.setxattr.keyval.key_sz,
-                 size);
+                 size + 1);
 
         ret = service_operation(
@@ -916 +950 @@
             get_interruptible_flag(inode));
 
-        gossip_debug(GOSSIP_XATTR_DEBUG,"pvfs2_inode_setxattr: returning %d\n"
-                                       , ret);
+        gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_setxattr: returning %d\n", ret);
 
         /* when request is serviced properly, free req op struct */

branches/cu-security-branch/src/proto/PINT-le-bytefield.c

@@ -95 +95 @@
 
     for (op_type=0; op_type<PVFS_SERV_NUM_OPS; op_type++) {
-        memset(&req.u, 0, sizeof(req.u));
         req.op = resp.op = op_type;
         reqsize = 0;
@@ -124 +123 @@
                 respsize = extra_size_PVFS_servresp_batch_create;
                 break;
-        case PVFS_SERV_CREATE:
-            zero_credential(&req.u.create.credential);
-            zero_capability(&resp.u.create.capability);
+            case PVFS_SERV_CREATE:
+                zero_credential(&req.u.create.credential);
+                zero_capability(&resp.u.create.capability);
                 /* can request a range of handles */
                 reqsize = extra_size_PVFS_servreq_create;
                 respsize = extra_size_PVFS_servresp_create;
                 break;
-            case PVFS_SERV_MIRROR:
-                 req.u.mirror.dist = &tmp_dist;
-                 req.u.mirror.dst_count = 0;
-                 reqsize = extra_size_PVFS_servreq_mirror;
-                 respsize = extra_size_PVFS_servresp_mirror;
-                 break;
-            case PVFS_SERV_IMM_COPIES:
-                 break;
             case PVFS_SERV_REMOVE:
                 /* nothing special, let normal encoding work */
@@ -362 +353 @@
     /* this encoder always uses just one buffer */
     BF_ENCODE_TARGET_MSG_INIT(target_msg);
-
-    gossip_debug(GOSSIP_ENDECODE_DEBUG,"\tmaxsize:%d\tinitializing_sizes:%d\n"
-                                      ,maxsize,initializing_sizes);
 
     /* allocate the max size buffer to avoid the work of calculating it */
@@ -403 +391 @@
     char **p;
 
-    gossip_debug(GOSSIP_ENDECODE_DEBUG,"Executing lebf_encode_req...\n");
-    gossip_debug(GOSSIP_ENDECODE_DEBUG,"\treq->op:%d\n",req->op);
-
     ret = encode_common(target_msg, max_size_array[req->op].req);
 
@@ -424 +409 @@
         CASE(PVFS_SERV_LOOKUP_PATH, lookup_path);
         CASE(PVFS_SERV_CREATE, create);
-        CASE(PVFS_SERV_MIRROR, mirror);
         CASE(PVFS_SERV_UNSTUFF, unstuff);
         CASE(PVFS_SERV_BATCH_CREATE, batch_create);
@@ -459 +443 @@
         case PVFS_SERV_MGMT_NOOP:
         case PVFS_SERV_PROTO_ERROR:
-        case PVFS_SERV_IMM_COPIES:
             /* nothing else */
             break;
@@ -532 +515 @@
         CASE(PVFS_SERV_LOOKUP_PATH, lookup_path);
         CASE(PVFS_SERV_CREATE, create);
-        CASE(PVFS_SERV_MIRROR, mirror);
         CASE(PVFS_SERV_UNSTUFF, unstuff);
         CASE(PVFS_SERV_BATCH_CREATE, batch_create);
@@ -566 +548 @@
         case PVFS_SERV_BATCH_REMOVE:
         case PVFS_SERV_PROTO_ERROR:
-        case PVFS_SERV_IMM_COPIES:
         case PVFS_SERV_MGMT_SETPARAM:
             /* nothing else */
@@ -634 +615 @@
         CASE(PVFS_SERV_LOOKUP_PATH, lookup_path);
         CASE(PVFS_SERV_CREATE, create);
-        CASE(PVFS_SERV_MIRROR, mirror);
         CASE(PVFS_SERV_UNSTUFF, unstuff);
         CASE(PVFS_SERV_BATCH_CREATE, batch_create);
@@ -668 +648 @@
         case PVFS_SERV_GETCONFIG:
         case PVFS_SERV_MGMT_NOOP:
-        case PVFS_SERV_IMM_COPIES:
             /* nothing else */
             break;
@@ -732 +711 @@
         CASE(PVFS_SERV_LOOKUP_PATH, lookup_path);
         CASE(PVFS_SERV_CREATE, create);
-        CASE(PVFS_SERV_MIRROR, mirror);
         CASE(PVFS_SERV_UNSTUFF, unstuff);
         CASE(PVFS_SERV_BATCH_CREATE, batch_create);
@@ -766 +744 @@
         case PVFS_SERV_MGMT_NOOP:
         case PVFS_SERV_PROTO_ERROR:
-        case PVFS_SERV_IMM_COPIES:
         case PVFS_SERV_MGMT_SETPARAM:
             /* nothing else */
@@ -854 +831 @@
                 decode_free(req->u.small_io.file_req);
                 break;
-
-            case PVFS_SERV_MIRROR:
-                decode_free(req->u.mirror.dist);
-                decode_free(req->u.mirror.dst_handle);
-                decode_free(req->u.mirror.wcIndex);
-                break;
 
             case PVFS_SERV_MKDIR:
@@ -887 +858 @@
                     decode_free(req->u.setattr.attr.u.meta.dfile_array);
                 break;
-
             case PVFS_SERV_LISTATTR:
                 if (req->u.listattr.handles)
                     decode_free(req->u.listattr.handles);
-                break;
-
-            case PVFS_SERV_SETEATTR:
-                decode_free(req->u.seteattr.key);
-                decode_free(req->u.seteattr.val);
-                break;
-
-            case PVFS_SERV_GETEATTR:
-                decode_free(req->u.geteattr.key);
-                decode_free(req->u.geteattr.valsz);
                 break;
 
@@ -936 +896 @@
             case PVFS_SERV_MGMT_PERF_MON:
             case PVFS_SERV_MGMT_EVENT_MON:
-
+            case PVFS_SERV_GETEATTR:
+            case PVFS_SERV_SETEATTR:
             case PVFS_SERV_DELEATTR:
             case PVFS_SERV_LISTEATTR:
             case PVFS_SERV_BATCH_REMOVE:
-            case PVFS_SERV_IMM_COPIES:
-              /*nothing to free*/
-                  break;
+                /* nothing to free */
+                break;
             case PVFS_SERV_INVALID:
             case PVFS_SERV_WRITE_COMPLETION:
@@ -1038 +998 @@
                         break;
                     }
-
-                case PVFS_SERV_MIRROR:
-                   {
-                      decode_free(resp->u.mirror.bytes_written);
-                      decode_free(resp->u.mirror.write_status_code);
-                      break;
-                   }
-
                case PVFS_SERV_GETCRED:
                     decode_free(resp->u.getcred.credential.group_array);
@@ -1073 +1025 @@
                 case PVFS_SERV_BATCH_REMOVE:
                 case PVFS_SERV_LOOKUP_PATH:
-                case PVFS_SERV_IMM_COPIES:
-                  /*nothing to free */
-                   break;
+                    /* nothing to free */
+                    break;
+
                 case PVFS_SERV_INVALID:
                 case PVFS_SERV_PERF_UPDATE:

branches/cu-security-branch/src/proto/pvfs2-req-proto.h

@@ -81 +81 @@
     PVFS_SERV_PRECREATE_POOL_REFILLER = 37, /* not a real protocol request */
     PVFS_SERV_UNSTUFF = 38,
-    PVFS_SERV_MIRROR = 39,
-    PVFS_SERV_IMM_COPIES = 40,
-    PVFS_SERV_GETCRED = 41,
+    PVFS_SERV_GETCRED = 39,
     /* leave this entry last */
     PVFS_SERV_NUM_OPS
@@ -939 +937 @@
     (PVFS_REQ_LIMIT_CONFIG_FILE_BYTES)
 
-/* mirror ******************************************************/
-/* - copies a datahandle owned by the local server to a data-  */
-/*   handle on a remote server. There could be multiple desti- */
-/*   nation data handles. dst_count tells us how many there    */
-/*   are.                                                      */
-struct PVFS_servreq_mirror
-{
-    PVFS_handle src_handle;
-    PVFS_handle *dst_handle;
-    PVFS_fs_id  fs_id;
-    PINT_dist   *dist;
-    uint32_t    bsize;
-    uint32_t    src_server_nr;
-    uint32_t    *wcIndex;
-    uint32_t     dst_count;
-    enum PVFS_flowproto_type flow_type;
-    enum PVFS_encoding_type encoding;
-};
-
-#ifdef __PINT_REQPROTO_ENCODE_FUNCS_C
-#define encode_PVFS_servreq_mirror(pptr,x) do {      \
-   encode_PVFS_handle(pptr,&(x)->src_handle);        \
-   encode_PVFS_fs_id(pptr,&(x)->fs_id);              \
-   encode_PINT_dist(pptr,&(x)->dist);                \
-   encode_uint32_t(pptr,&(x)->bsize);                \
-   encode_uint32_t(pptr,&(x)->src_server_nr);        \
-   encode_uint32_t(pptr,&(x)->dst_count);            \
-   encode_enum(pptr,&(x)->flow_type);                \
-   encode_enum(pptr,&(x)->encoding);                 \
-   int i;                                            \
-   for (i=0; i<(x)->dst_count; i++)                  \
-   {                                                 \
-       encode_PVFS_handle(pptr,&(x)->dst_handle[i]); \
-       encode_uint32_t(pptr,&(x)->wcIndex[i]);       \
-   }                                                 \
-} while (0)
-
-#define decode_PVFS_servreq_mirror(pptr,x) do {          \
-   decode_PVFS_handle(pptr,&(x)->src_handle);            \
-   decode_PVFS_fs_id(pptr,&(x)->fs_id);                  \
-   decode_PINT_dist(pptr,&(x)->dist);                    \
-   decode_uint32_t(pptr,&(x)->bsize);                    \
-   decode_uint32_t(pptr,&(x)->src_server_nr);            \
-   decode_uint32_t(pptr,&(x)->dst_count);                \
-   decode_enum(pptr,&(x)->flow_type);                    \
-   decode_enum(pptr,&(x)->encoding);                     \
-   (x)->dst_handle = decode_malloc((x)->dst_count *      \
-                                   sizeof(PVFS_handle)); \
-   (x)->wcIndex = decode_malloc((x)->dst_count *         \
-                               sizeof(uint32_t));        \
-   int i;                                                \
-   for (i=0; i<(x)->dst_count; i++)                      \
-   {                                                     \
-       decode_PVFS_handle(pptr,&(x)->dst_handle[i]);     \
-       decode_uint32_t(pptr,&(x)->wcIndex[i]);           \
-   }                                                     \
-} while (0)
-#endif
-
-#define extra_size_PVFS_servreq_mirror \
-   ( (sizeof(PVFS_handle) * PVFS_REQ_LIMIT_HANDLES_COUNT) + \
-     (sizeof(uint32_t) * PVFS_REQ_LIMIT_HANDLES_COUNT) )
-
-/*Response to mirror request.  Identifies the number of bytes written and the */
-/*status of that write for each source-destination handle pair. (Source is    */
-/*always the same for each pair.)                                             */
-struct PVFS_servresp_mirror
-{
-    PVFS_handle src_handle;
-    uint32_t src_server_nr;
-    uint32_t *bytes_written;
-    uint32_t *write_status_code;
-    uint32_t dst_count;
-};
-
-#ifdef __PINT_REQPROTO_ENCODE_FUNCS_C
-#define encode_PVFS_servresp_mirror(pptr,x) do {         \
-   encode_PVFS_handle(pptr,&(x)->src_handle);            \
-   encode_uint32_t(pptr,&(x)->src_server_nr);            \
-   encode_uint32_t(pptr,&(x)->dst_count);                \
-   int i;                                                \
-   for (i=0; i<(x)->dst_count; i++)                      \
-   {                                                     \
-       encode_uint32_t(pptr,&(x)->bytes_written[i]);     \
-       encode_uint32_t(pptr,&(x)->write_status_code[i]); \
-   }                                                     \
-} while (0)
-
-#define decode_PVFS_servresp_mirror(pptr,x) do {            \
-  decode_PVFS_handle(pptr,&(x)->src_handle);                \
-  decode_uint32_t(pptr,&(x)->src_server_nr);                \
-  decode_uint32_t(pptr,&(x)->dst_count);                    \
-  (x)->bytes_written     = decode_malloc((x)->dst_count *   \
-                                         sizeof(uint32_t)); \
-  (x)->write_status_code = decode_malloc((x)->dst_count *   \
-                                         sizeof(uint32_t)); \
-  int i;                                                    \
-  for (i=0; i<(x)->dst_count; i++ )                         \
-  {                                                         \
-      decode_uint32_t(pptr,&(x)->bytes_written[i]);         \
-      decode_uint32_t(pptr,&(x)->write_status_code[i]);     \
-  }                                                         \
-} while (0)
-#endif
-
-#define extra_size_PVFS_servresp_mirror \
-  ( (sizeof(uint32_t) * PVFS_REQ_LIMIT_HANDLES_COUNT) + \
-    (sizeof(uint32_t) * PVFS_REQ_LIMIT_HANDLES_COUNT) )
-
-
 /* truncate ****************************************************/
 /* - resizes an existing datafile */
@@ -1913 +1801 @@
     union
     {
-        struct PVFS_servreq_mirror mirror;
         struct PVFS_servreq_create create;
         struct PVFS_servreq_unstuff unstuff;
@@ -1978 +1865 @@
     union
     {
-        struct PVFS_servresp_mirror mirror;
         struct PVFS_servresp_create create;
         struct PVFS_servresp_unstuff unstuff;

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

@@ -150 +150 @@
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
-
-   gossip_err("Executing create_metafile.....\n");
-   
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int ret = -1;
@@ -183 +180 @@
     struct PINT_smcb *smcb, job_status_s *js_p)
 {
-  gossip_err("Executing check_stuffed...\n");
-
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int server_type;
@@ -203 +198 @@
 
     layout = &s_op->req->u.create.layout;
-
-    gossip_err("layout algorithm is %d.\n",layout->algorithm);
 
     if(layout->algorithm == PVFS_SYS_LAYOUT_LIST)
@@ -255 +248 @@
 
         s_op->resp.u.create.stuffed = 1;
-     s_op->u.create.handle_array_local[0] = 100;
-  gossip_err("File will be stuffed.\n");
         js_p->error_code = 0;
         return SM_ACTION_COMPLETE;
@@ -394 +385 @@
         s_op->req->hints);
 
-   gossip_err("Value of ret from job_trove_dspace_create_list is %d.\n",ret);
-   gossip_err("handle_array_local[0] is %llu.\n",llu(*(s_op->u.create.handle_array_local)));
-
-
     return(ret);
 }
@@ -442 +429 @@
     }
 
+    free(s_op->resp.u.create.datafile_handles);
+
     ret = job_trove_dspace_remove(
         s_op->req->u.create.fs_id,
@@ -653 +642 @@
     s_op->val_a[0].buffer = s_op->resp.u.create.datafile_handles;
     s_op->val_a[0].buffer_sz =
-         s_op->resp.u.create.datafile_count * sizeof(PVFS_handle);
+        s_op->resp.u.create.datafile_count * sizeof(PVFS_handle);
 
     s_op->key_a[1].buffer = Trove_Common_Keys[METAFILE_DIST_KEY].key;

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

@@ -94 +94 @@
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing io_send_ack (io.sm)....\n");
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int err = -PVFS_EIO;
@@ -107 +106 @@
     s_op->resp.u.io.bstream_size = s_op->ds_attr.u.datafile.b_size;
 
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"/tbstream_size:%d\n"
-                                    ,(int)s_op->resp.u.io.bstream_size);
-
     err = PINT_encode(&s_op->resp, PINT_ENCODE_RESP, &(s_op->encoded),
                       s_op->addr, s_op->decoded.enc_type);
@@ -205 +201 @@
     }
 
-    gossip_err("SERVER: IO SM: s_op->tag:%d\n",s_op->tag);
-
     gossip_debug(GOSSIP_IO_DEBUG, "flow: fsize: %lld, " 
         "server_nr: %d, server_ct: %d\n",
@@ -243 +237 @@
     }
 
-    gossip_debug(GOSSIP_IO_DEBUG,"\tabout to issue job_flow...\n");
     err = job_flow(s_op->u.io.flow_d, smcb, 0, js_p, &tmp_id,
                    server_job_context, user_opts->server_job_flow_timeout
                    , s_op->req->hints);
-
-    gossip_debug(GOSSIP_IO_DEBUG,"\treturn code from job_flow "
-                                 "submission:%d\n"
-                                ,err);
 
     return err;
@@ -351 +340 @@
     job_id_t tmp_id;
     struct server_configuration_s *user_opts = get_server_config_struct();
-    
-    gossip_debug(GOSSIP_IO_DEBUG,"Executing io_send_completion_ack.\n");
-    
+        
     /* we only send this trailing ack if we are working on a write
      * operation; otherwise just cut out early
@@ -389 +376 @@
     }
 
-    gossip_debug(GOSSIP_IO_DEBUG,"\ts_op->tag:%d\n",s_op->tag);
-
     err = job_bmi_send_list(
         s_op->addr, s_op->encoded.buffer_list, s_op->encoded.size_list,
@@ -397 +382 @@
         server_job_context, user_opts->server_job_bmi_timeout,
         s_op->req->hints);
-
-    gossip_debug(GOSSIP_IO_DEBUG,"return code from sending ack:%d\n"
-                                ,err);
 
     return err;

branches/cu-security-branch/src/server/module.mk.in

@@ -10 +10 @@
                 $(DIR)/lookup.c \
                 $(DIR)/create.c \
-                $(DIR)/mirror.c \
-                $(DIR)/create-immutable-copies.c \
                 $(DIR)/batch-create.c \
                 $(DIR)/batch-remove.c \

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

@@ -70 +70 @@
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing pvfs2_prelude_sm:prelude_setup...\n");
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tbase frame:%d\tframe count:%d\n"
-                                    ,smcb->base_frame,smcb->frame_count);
     int ret;
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
@@ -94 +91 @@
     int ret = -PVFS_EINVAL;
 
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing pvfs2_prelude_work_sm:prelude_req_sched\n");
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tbase_frame:%d\tframe_count:%d\n"
-                                    ,smcb->base_frame,smcb->frame_count);
     gossip_debug(GOSSIP_SERVER_DEBUG,
         "(%p) %s (prelude sm) state: req_sched\n", s_op,
@@ -136 +130 @@
     if (s_op->target_handle == PVFS_HANDLE_NULL)
     {
-
         js_p->error_code = 0;
         return SM_ACTION_COMPLETE;

branches/cu-security-branch/src/server/pvfs2-server-req.c

@@ -48 +48 @@
 extern struct PINT_server_req_params pvfs2_stuffed_create_params;
 extern struct PINT_server_req_params pvfs2_precreate_pool_refiller_params;
-extern struct PINT_server_req_params pvfs2_mirror_params;
-extern struct PINT_server_req_params pvfs2_create_immutable_copies_params;
 extern struct PINT_server_req_params pvfs2_get_cred_params;
 
@@ -94 +92 @@
     /* 37 */ {PVFS_SERV_PRECREATE_POOL_REFILLER, &pvfs2_precreate_pool_refiller_params},
     /* 38 */ {PVFS_SERV_UNSTUFF, &pvfs2_unstuff_params},
-    /* 39 */ {PVFS_SERV_MIRROR, &pvfs2_mirror_params},
-    /* 40 */ {PVFS_SERV_IMM_COPIES, &pvfs2_create_immutable_copies_params},
-    /* 41 */ {PVFS_SERV_GETCRED, &pvfs2_get_cred_params}
+    /* nlmills: TODO: does this list need to be in a specific order? */
+    /* 39 */ {PVFS_SERV_GETCRED, &pvfs2_get_cred_params}
 };
 

branches/cu-security-branch/src/server/pvfs2-server.h

@@ -148 +148 @@
 };
 
-/*MIRROR structures*/
-typedef struct 
-{
-   /* session identifier created in the PVFS_SERV_IO request.  also used as  */
-   /* the flow identifier.                                                   */
-   bmi_msg_tag_t session_tag;
-
-   /*destination server address*/
-   PVFS_BMI_addr_t svr_addr;
-
-   /*status from PVFS_SERV_IO*/
-   PVFS_error io_status;
-
-   /*variables used to setup write completion ack*/
-   void        *encoded_resp_p;
-   job_status_s recv_status;
-   job_id_t     recv_id;
-
-   /*variables used to setup flow between the src & dest datahandle*/
-   flow_descriptor *flow_desc;
-   job_status_s     flow_status;
-   job_id_t         flow_job_id;
-  
-} write_job_t;
-
-
-/*This structure is used during the processing of a "mirror" request.*/
-struct PINT_server_mirror_op
-{
-   /*keep up with the number of outstanding jobs*/
-   int job_count;
-
-   /*maximum response size for the write request*/
-   int max_resp_sz;
-
-   /*info about each job*/
-   write_job_t *jobs;
-};
-typedef struct PINT_server_mirror_op PINT_server_mirror_op;
-
-/* Source refers to the handle being copied, and destination refers to        */
-/* its copy.                                                                  */
-struct PINT_server_create_copies_op
-{
-    /*number of I/O servers required to meet the mirroring request.           */
-    uint32_t io_servers_required;
-
-    /*mirroring mode. attribute key is user.pvfs2.mirror.mode*/
-    MIRROR_MODE mirror_mode;
-
-    /*the expected mirroring mode tells us how to edit the retrieved mirroring*/
-    /*mode.  Example: if mirroring was called when immutable was set, then    */
-    /*the expected mirroring mode would be MIRROR_ON_IMMUTABLE.               */
-    MIRROR_MODE expected_mirror_mode;
-
-    /*buffer holding list of remote servers for all copies of the file*/
-    char **my_remote_servers;
-
-    /*saved error code*/
-    PVFS_error saved_error_code;
-
-    /*number of copies desired. value of user.pvfs2.mirror.copies attribute*/
-    uint32_t copies;
-
-    /*successful/failed writes array in order of source handles         */
-    /*0=>successful  !UINT64_HIGH=>failure   UINT64_HIGH=>initial state */
-    /*accessed as if a 2-dimensional array [SrcHandleNR][#ofCopies]     */
-    PVFS_handle *writes_completed;
-
-    /*number of attempts at writing handles*/
-    int retry_count;
-
-    /*list of server names that will be used as destination servers*/
-    char **io_servers;                       
-
-    /*source remote server names in distribution*/
-    char **remote_io_servers;
-
-    /*source local server names in distribution*/;                
-    char **local_io_servers;
-
-    /*number of source server names in the distribution*/                     
-    int num_io_servers;
-
-    /*number of source remote server names in distribution*/                  
-    int remote_io_servers_count;             
-
-    /*number of source local server names in distribution*/
-    int local_io_servers_count;              
-
-    /*source datahandles in order of distribution*/
-    PVFS_handle *handle_array_base;
-
-    /*local source datahandles*/
-    PVFS_handle *handle_array_base_local;
-
-    /*destination datahandles in order of distribution*/          
-    PVFS_handle *handle_array_copies;        
-
-    /*local destination datahandles*/
-    PVFS_handle *handle_array_copies_local;  
-
-    /*remote destination datahandles*/
-    PVFS_handle *handle_array_copies_remote;
-
-    /*number of local source datahandles*/
-    int handle_array_base_local_count; 
-
-    /*number of local destination datahandles*/
-    int handle_array_copies_local_count;      
-
-    /*number of remote destination datahandles*/
-    int handle_array_copies_remote_count;     
-
-    /*number of source datahandles*/
-    uint32_t dfile_count;
-
-    /*source metadata handle*/                     
-    PVFS_handle metadata_handle; 
-
-    /*source file system*/
-    PVFS_fs_id fs_id; 
-
-    /*number of io servers defined in the current file system*/
-    int io_servers_count; 
-
-    /*size of the source distribution structure */
-    uint32_t dist_size;
-
-    /*distribution structure for basic_dist*/
-    PINT_dist *dist;
-
-    /*local source handles' attribute structure*/
-    /*populates bstream_array_base_local with byte stream size*/
-    PVFS_ds_attributes *ds_attr_a;
-
-    /*local source handles' byte stream size*/
-    /*index corresponds to handle_array_base*/
-    PVFS_size *bstream_array_base_local;
-};
-typedef struct PINT_server_create_copies_op PINT_server_create_copies_op;
-
-
-/*This macro is used to initialize a PINT_server_op structure when pjmp'ing */
-/*to pvfs2_create_immutable_copies_sm.                                      */
-#define PVFS_SERVOP_IMM_COPIES_FILL(__new_p,__cur_p)                           \
-do {                                                                           \
-   memcpy(__new_p,__cur_p,sizeof(struct PINT_server_op));                      \
-   (__new_p)->op = PVFS_SERV_IMM_COPIES;                                       \
-   memset(&((__new_p)->u.create_copies),0,sizeof((__new_p)->u.create_copies)); \
-}while(0)
-
-
-
 /* struct PINT_server_lookup_op
  *
@@ -499 +345 @@
 
     /* generic structures used in most server operations */
-    PVFS_ds_keyval key, val; 
+    PVFS_ds_keyval key, val;
     PVFS_ds_keyval *key_a;
     PVFS_ds_keyval *val_a;
@@ -565 +411 @@
         struct PINT_server_batch_remove_op batch_remove;
         struct PINT_server_unstuff_op unstuff;
-        struct PINT_server_create_copies_op create_copies;
-        struct PINT_server_mirror_op mirror;
         struct PINT_server_getcred_op getcred;
     } u;
@@ -662 +506 @@
  * no return value
  */
-#ifdef GOSSIP_DISABLE_DEBUG
+/*#ifdef GOSSIP_DISABLE_DEBUG*/
 #define PINT_ACCESS_DEBUG(__s_op, __mask, format, f...) do {} while (0)
+/*
 #else
 #define PINT_ACCESS_DEBUG(__s_op, __mask, format, f...)                     \
@@ -673 +518 @@
                               const char * format,
                               ...) __attribute__((format(printf, 3, 4)));
-/* server side state machines */
-extern struct PINT_state_machine_s pvfs2_mirror_sm;
-
+*/
 
 /* nested state machines */
@@ -686 +529 @@
 extern struct PINT_state_machine_s pvfs2_mkdir_work_sm;
 extern struct PINT_state_machine_s pvfs2_unexpected_sm;
-extern struct PINT_state_machine_s pvfs2_create_immutable_copies_sm;
-extern struct PINT_state_machine_s pvfs2_call_msgpairarray_sm;
-extern struct PINT_state_machine_s pvfs2_mirror_work_sm;
 
 /* Exported Prototypes */

branches/cu-security-branch/src/server/set-eattr.sm

@@ -16 +16 @@
 #include "pint-eattr.h"
 #include "pint-security.h"
-#include "pvfs2-mirror.h"
-
-
-enum {
-   PVFS2_MAKE_IMMUTABLE_COPIES = 200,
-   CREATE_IMM_COPIES = 300
-};
 
 %%
@@ -45 +38 @@
     {
         run seteattr_setobj_eattribs;
-        success => check_immutable;
         default => final_response;
     }
-
-    state check_immutable
-    {
-        run check_immutable;
-        PVFS2_MAKE_IMMUTABLE_COPIES => generate_copies;
-        default => final_response;
-    }
-
-    state generate_copies
-    {
-        pjmp setup_create_immutable_copies
-        {
-           CREATE_IMM_COPIES => pvfs2_create_immutable_copies_sm;
-        }
-        success => inspect_imm_copies;
-        default => final_response;
-    }
-
-    state inspect_imm_copies
-    {
-         run inspect_imm_copies;
-         default => final_response;
-    }
-
 
     state final_response
@@ -89 +57 @@
 
 /*
- * This routine checks keys to confirm that the name spaces are valid and to see
- * if the immutable flag is set for the user.pvfs2.meta_hint namespace.
+ * This routine checks keys to confirm that the name spaces are valid.
  * It also prints debugging information.
  */
@@ -97 +64 @@
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    int i; 
-
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Current Frame Pointer in set-eattr.sm "
-                                     "is %p.\n",s_op);       
-
+    int i;
     PVFS_object_attr *a_p = NULL;
     a_p = &s_op->attr;
@@ -115 +78 @@
 
     /* iterate through the keys that are being written */
-    int j = 0;
-    char *valBuf = NULL;
     for (i = 0; i < s_op->req->u.seteattr.nkey; i++)
     {
-        gossip_debug(GOSSIP_MIRROR_DEBUG
-                    ,"\tkey:%s\n"
-                    ,(char *)s_op->req->u.seteattr.key[i].buffer);
-        valBuf = (char *)s_op->req->u.seteattr.val[i].buffer;
-        for (j=0; j<s_op->req->u.seteattr.val[i].buffer_sz; j++)
-            gossip_debug(GOSSIP_MIRROR_DEBUG,"\tval[%d]=%#x\n"
-                                            ,j
-                                            ,(unsigned int)valBuf[j]);
         js_p->error_code = PINT_eattr_namespace_verify(
             &s_op->req->u.seteattr.key[i],
             &s_op->req->u.seteattr.val[i]);
-
-        if(js_p->error_code)
+        if(!js_p->error_code)
         {
             return SM_ACTION_COMPLETE;
         }
-
-    } /*end for*/
-
+    }
 
     return SM_ACTION_COMPLETE;
@@ -199 +149 @@
 }
 
-static PINT_sm_action setup_create_immutable_copies(struct PINT_smcb *smcb
-                                                   ,job_status_s *js_p)
-{
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing setup_create_immutable_copies.."
-                                     "\n");
-    struct PINT_server_op *s_op = PINT_sm_frame(smcb,PINT_FRAME_CURRENT);
-    int ret;
-  
-    js_p->error_code = 0;
-
-    struct PINT_server_op *new_op = malloc(sizeof(struct PINT_server_op));
-    if (!new_op)
-    {
-        js_p->error_code = -PVFS_ENOMEM;
-        return SM_ACTION_COMPLETE;
-    }
-    memset(new_op,0,sizeof(struct PINT_server_op));
-
-    PVFS_SERVOP_IMM_COPIES_FILL(new_op,s_op);
-    new_op->u.create_copies.expected_mirror_mode = MIRROR_ON_IMMUTABLE;
-
-    ret = PINT_sm_push_frame(smcb,CREATE_IMM_COPIES,new_op);
-    if (ret != 0)
-    {
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\tseteattr: failed to setup "
-                                        "nested sm.\n");
-       js_p->error_code = ret;
-    }
-
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tseteattr:s_op:%p "
-                                     "\tnew_op:%p\n",s_op,new_op);
-    return SM_ACTION_COMPLETE;
-}/*end action setup_create_immutable_copies*/
-
-
-static PINT_sm_action inspect_imm_copies(struct PINT_smcb *smcb
-                                        ,job_status_s *js_p)
-{
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing inspect_imm_copies....\n");
-
-    struct PINT_server_op *s_op   = PINT_sm_frame(smcb,PINT_FRAME_CURRENT)
-                         ,*imm_op = NULL;
-    int task_id, error_code, remaining;
-
-    /*js_p->error_code will be zero upon entering this function*/
-
-    /*error_code will have the value returned in js_p->error_code via the */
-    /*cleanup function in create-immutable-copies.sm                      */
-    imm_op = PINT_sm_pop_frame(smcb, &task_id, &error_code, &remaining);
-
-    assert(imm_op->op == PVFS_SERV_IMM_COPIES);
-
-    /*check error codes from mirror copies*/
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tstatus of copies:%d\n",error_code);    
-
-    if ( PVFS_get_errno_mapping(error_code) == EPERM )
-    {
-        /*If EPERM, then create-immutable-copies detected that the  */
-        /*mirror mode is NO_MIRRORING or the mode didn't exist.     */
-        js_p->error_code = 0;
-    } else {
-      /*set error_code based on return from copies.                   */
-      /*this error_code will then be passed to the caller of set-eattr*/
-      js_p->error_code = error_code;
-    }
-
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tfrom pop, imm_op:%p\n"
-                                    ,imm_op);
-
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tcurrent, s_op:%p\n",s_op);
-
-    if (js_p->error_code)
-    {
-       gossip_err("File NOT mirrored successfully(%d)\n",js_p->error_code);
-    }
-    else
-    {
-       gossip_err("File successfully mirrored.\n");
-    }
-
-    /*free memory from popped stack frame*/
-    free(imm_op);
-
-    return SM_ACTION_COMPLETE;
-}/*end action inspect_imm_copies*/
-
-
-
-
-/*
- * Function: check_immutable
- *
- * Params:   server_op *b, 
- *           job_status_s *js_p
- *
- * Returns:  SM_action
- *
- * Synopsis: If the immutable flag is set, then make a mirror.
- *           
- */
-static PINT_sm_action check_immutable(struct PINT_smcb *smcb
-                                         ,job_status_s *js_p)
-{
-    gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing check_immutable....\n");
-
-    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    int i; 
-
-    PVFS_flags         immutable_is_on = 0;
-    PVFS_metafile_hint hint;
-    PVFS_ds_keyval    *k=NULL, *v=NULL;
-
-    js_p->error_code = 0;
-   
-    for (i = 0; i < s_op->req->u.seteattr.nkey; i++)
-    {
-        v = &s_op->req->u.seteattr.val[i];
-        k = &s_op->req->u.seteattr.key[i];
-
-        /* Are we working with the correct namespace?  The immutable flag is */
-        /* a hint that can be set in the "user.pvfs2.meta_hint" namespace.   */
-        if (strcmp(k->buffer,"user.pvfs2.meta_hint") != 0){
-            continue;
-        }
-
-        memset(&hint, 0, sizeof(hint));
-        memcpy(&hint, v->buffer, sizeof(v->buffer));
-
-        gossip_debug(GOSSIP_MIRROR_DEBUG,"My converted buffer is %llu.\n"
-                                        ,llu(hint.flags));
-
-        immutable_is_on = hint.flags & PVFS_IMMUTABLE_FL;
-
-        gossip_debug(GOSSIP_MIRROR_DEBUG
-                     ,"My key is %s.  My key value is %llu"
-                      "\n"
-                      "PVFS_IMMUTABLE_FL is %llu.\n"
-                     ,(char *)k->buffer
-                     ,llu(hint.flags)
-                     ,llu(PVFS_IMMUTABLE_FL) );
-        gossip_debug(GOSSIP_MIRROR_DEBUG,"immutable_is_on is %llu.\n"
-                                        ,llu(immutable_is_on));
-        gossip_debug(GOSSIP_MIRROR_DEBUG,"IMMUTABLE is %s.\n",
-                                          immutable_is_on ? "ON" : "OFF");
-
-        if (immutable_is_on){
-            js_p->error_code = PVFS2_MAKE_IMMUTABLE_COPIES;
-            break; 
-        }
-    } /*end for*/
-
-    return SM_ACTION_COMPLETE;
-}/*end action check_immutable*/
-
-
-
-
 /*
  * Function: setattr_cleanup

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

@@ -671 +671 @@
     }
 
-  gossip_err("Attributes show file as stuffed.\n");
     gossip_debug(GOSSIP_SERVER_DEBUG,
         "unstuff found stuffed file.\n");

branches/cu-security-branch/test/automated/README.tests

@@ -1 +1 @@
 #
-# $Date: 2009-09-02 20:16:21 $
+# $Date: 2010-05-21 17:34:25 $
 #
 # A brief description of the contents of the test/automated directory

branches/cu-security-branch/test/automated/testscrpt.sh

@@ -38 +38 @@
 TESTNAME="`hostname -s`-nightly"
 
-# before starting any client apps, we need to deal with the possiblity that we
-# might have built with shared libraries
-export LD_LIBRARY_PATH=${PVFS2_DEST}/INSTALL-pvfs2-${CVS_TAG}/lib:${LD_LIBRARY_PATH}
 
 # we only have a few hosts that meet all the earlier stated prereqs
 VFS_HOSTS="gil lain stan"
 
-#
-# Detect basic heap corruption
-#
-export MALLOC_CHECK_=2
 
 # takes one argument: a tag or branch in CVS
@@ -103 +96 @@
         sudo dmesg -c >/dev/null
         sudo /sbin/insmod ${PVFS2_DEST}/INSTALL-pvfs2-${CVS_TAG}/lib/modules/`uname -r`/kernel/fs/pvfs2/pvfs2.ko
-        sudo LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${PVFS2_DEST}/INSTALL-pvfs2-${CVS_TAG}/sbin/pvfs2-client \
+        sudo ${PVFS2_DEST}/INSTALL-pvfs2-${CVS_TAG}/sbin/pvfs2-client \
                 -p ${PVFS2_DEST}/INSTALL-pvfs2-${CVS_TAG}/sbin/pvfs2-client-core \
                 -L ${PVFS2_DEST}/pvfs2-client-${CVS_TAG}.log
@@ -201 +194 @@
                         echo -n "====== running $f ..."
                         ./$f > ${PVFS2_DEST}/${f}-${CVS_TAG}.log
-                        if [ $? -eq 0 ] ; then 
+                        if [ $? == 0 ] ; then 
                                 nr_passed=$((nr_passed + 1))
                                 echo "OK"

branches/cu-security-branch/test/client/mpi-io/module.mk.in

@@ -4 +4 @@
         $(DIR)/mpi-io-test.c \
         $(DIR)/mpi-md-test.c \
-        $(DIR)/mpi-unbalanced-test.c \
-        $(DIR)/multi-md-test.c \
-        $(DIR)/multi-md-test-size-sweep.c
+        $(DIR)/mpi-unbalanced-test.c

branches/cu-security-branch/test/client/mpi-io/mpi-io-test.c

@@ -37 +37 @@
 static int64_t opt_block     = 16*1024*1024;
 static int     opt_iter      = 1;
-static int     opt_individual_file = 0;
 static int     opt_coll      = 0;
 static int     opt_correct   = 0;
@@ -53 +52 @@
 static void usage(void);
 static void handle_error(int errcode, char *str);
-static int check_count(int count, MPI_Datatype type, MPI_Status *status);
 
 /* global vars */
@@ -82 +80 @@
    int namelen;
    char processor_name[MPI_MAX_PROCESSOR_NAME];
-   char file_name[1024];
 
    /* startup MPI and determine the rank of this process */
@@ -95 +92 @@
    if (opt_verbose) fprintf(stdout,"Process %d of %d is on %s\n",
                                                                          mynod, nprocs, processor_name);
-   
-   if (opt_individual_file)
-   {
-        sprintf(file_name, "%s_%d", opt_file, mynod);
-   }
-   else
-   {
-        strncpy(file_name, opt_file, 1023);
-   }
 
    if (mynod == 0) printf("# Using mpi-io calls.\n");
@@ -138 +126 @@
                 comm = MPI_COMM_SELF;
         }
-   err = MPI_File_open(comm, file_name, 
+   err = MPI_File_open(comm, opt_file, 
                                                           MPI_MODE_CREATE | MPI_MODE_RDWR, MPI_INFO_NULL, &fh);
    if (err != MPI_SUCCESS) {
@@ -155 +143 @@
        * we want to measure cached performance of file servers */
       if (opt_single == 1)
-      {
                         seek_position = 0;
-      }
       else
-      {
-           if (opt_individual_file)
-           {
-              seek_position = (j*opt_block);
-           }
-           else
-           {
                         /* seek to an appropriate position depending on the iteration 
                          * and rank of the current process */
-                      seek_position = (j*iter_jump)+(mynod*opt_block);
-           }
-      }
+                        seek_position = (j*iter_jump)+(mynod*opt_block);
 
       MPI_File_seek(fh, seek_position, MPI_SEEK_SET);
@@ -191 +168 @@
                 }
       if(err){
-                        handle_error(err, "MPI_File_write/write_all");
-      }
-                if (opt_correct && !check_count(nchars, MPI_CHAR, &status)) {
-                        my_correct = 0;
-                   fprintf(stderr, "short write");
-                }
+         fprintf(stderr, "node %d, write error: %s\n", mynod, 
+         strerror(errno));
+      }
       if (opt_sync) sync_err = MPI_File_sync(fh);
       if (sync_err) {
-                        handle_error(err, "MPI_File_sync");
+         fprintf(stderr, "node %d, sync error: %s\n", mynod, 
+                                          strerror(errno));
       }
 
@@ -213 +188 @@
    err = MPI_File_close(&fh);
    if(err){
-                handle_error(err, "MPI_File_close");
+      fprintf(stderr, "node %d, close error after write\n", mynod);
    }
     
@@ -223 +198 @@
                            MPI_MODE_CREATE | MPI_MODE_RDWR, MPI_INFO_NULL, &fh);
    if (err < 0) {
-                handle_error(err, "MPI_File_open");
+      fprintf(stderr, "node %d, open error: %s\n", mynod, strerror(errno));
       goto die_jar_jar_die;
    }
@@ -233 +208 @@
       /* reading and writing to the same block is cheating, but sometimes
        * we want to measure cached performance of file servers */
-      if (opt_single == 1)
-      {
-            seek_position = 0;
-      }
-      else
-      {
-           if (opt_individual_file)
-           {
-              seek_position = (j*opt_block);
-           }
-           else
-           {
-            /* seek to an appropriate position depending on the iteration 
-             * and rank of the current process */
-              seek_position = (j*iter_jump)+(mynod*opt_block);
-           }
-      }
+      if (opt_single == 1) {
+                        seek_position = 0;
+                }
+      else {
+                        /* seek to an appropriate position depending on the iteration 
+                         * and rank of the current process */
+                        seek_position = (j*iter_jump)+(mynod*opt_block);
+                }
 
       MPI_File_seek(fh, seek_position, MPI_SEEK_SET);
@@ -271 +237 @@
 
       if (err < 0) {
-                        handle_error(err, "MPI_File_write/write_all");
-                }
-                if (opt_correct && !check_count(nchars, MPI_CHAR, &status)) {
-                        my_correct = 0;
-                        fprintf(stderr, "short read");
+                        fprintf(stderr, "node %d, read error, loc = %lld: %s\n",
+                                mynod, (long long) mynod*opt_block, strerror(myerrno));
                 }
 
@@ -308 +271 @@
    err = MPI_File_close(&fh);
    if (err) {
-           handle_error(err, "MPI_File_close");
+      fprintf(stderr, "node %d, close error after write\n", mynod);
    }
 
@@ -388 +351 @@
    int c;
    
-   while ((c = getopt(argc, argv, "b:i:f:p:CcyShvrwI")) != EOF) {
+   while ((c = getopt(argc, argv, "b:i:f:p:CcyShvrw")) != EOF) {
       switch (c) {
          case 'b': /* block size */
@@ -395 +358 @@
          case 'i': /* iterations */
             opt_iter = atoi(optarg);
-            break;
-         case 'I': /* individual file per process */
-            opt_individual_file = 1;
             break;
          case 'f': /* filename */
@@ -439 +399 @@
       }
    }
-   
-   if ( opt_individual_file  && opt_coll )
-   {
-        printf("Flags individual file in combination with collective "
-            "I/O operation not compatible\n"); 
-        exit(1);
-   }
    return(0);
 }
@@ -457 +410 @@
     printf(" -C       perform operations Collectively [default: off]\n");
     printf(" -i       iterations [default: 1]\n");
-    printf(" -I       individual file per process [default: off]\n");
     printf(" -f       filename [default: /foo/test.out]\n");
     printf(" -p       path to pvfs2tab file to use [default: notset]\n");
@@ -475 +427 @@
     MPI_Error_string(errcode, msg, &resultlen);
     fprintf(stderr, "%s: %s\n", str, msg);
-}
-
-static int check_count(int count, MPI_Datatype type, MPI_Status *status)
-{
-    int statcount;
-    MPI_Get_count(status, type, &statcount);
-         return (statcount==count);
+    MPI_Abort(MPI_COMM_WORLD, 1);
 }
 
@@ -490 +436 @@
  *  tab-width: 3
  *
+ * vim: ts=3
  * End:
- * vim: ts=3
  */ 
+
+

branches/cu-security-branch/test/common/gen-locks/module.mk.in

@@ -1 +1 @@
 DIR := common/gen-locks
 
+TESTSRC += \
+        $(DIR)/test-pthread-lock.c \
+        $(DIR)/test-null-lock.c
+
+# for the null locking example, we want to set the right defines at
+# compile time
+$(DIR)/test-null-lock.o: $(DIR)/test-null-lock.c
+        $(Q) "  CC              $@"
+        $(E)$(CC) $< $(CFLAGS) -D__GEN_NULL_LOCKING__ -c -o $@
+
+# for the pthread locking example, we use default defines (and thus
+# stick with the implicit compile rule), but we need to add an extra lib
+# when linking
+$(DIR)/test-pthread-lock: $(DIR)/test-pthread-lock.o
+        $(Q) "  LD              $@"
+        $(E)$(LD) $< $(LDFLAGS) $(LIBS) -lpthread -o $@
+

branches/cu-security-branch/test/common/id-generator/test.c

@@ -24 +24 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "pvfs2.h"
-#include "id-generator.h"
+#include <id-generator.h>
 
 /* This code is a pretty pointless example.  It just generates a handle

branches/cu-security-branch/test/configure

@@ -842 +842 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-verbose-build  Enables full output during build process
-  --disable-thread-safety Disables thread safety in the client library
   --enable-strict         Turn on strict debugging with gcc
 
@@ -2923 +2922 @@
 fi;
 
-# Check whether --enable-thread-safety or --disable-thread-safety was given.
-if test "${enable_thread_safety+set}" = set; then
-  enableval="$enable_thread_safety"
-  if test "x$enableval" = "xno" ; then
-    CFLAGS="$CFLAGS -D__GEN_NULL_LOCKING__"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-else
-     CFLAGS="$CFLAGS -D__GEN_POSIX_LOCKING__"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-fi;
-
 PVFS2_SRC_RELATIVE_TOP="${srcdir}/.."
 PVFS2_BUILD_RELATIVE_TOP=".."
@@ -3638 +3622 @@
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpvfs2  $LIBS"
+LIBS="-lpvfs2 -lssl -lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3707 +3691 @@
 echo "$as_me: error: \"could not find libpvfs2... must specify path to PVFS2 installation or build tree with --with-pvfs2-build\"" >&2;}
    { (exit 1); exit 1; }; }
-
 fi
 

branches/cu-security-branch/test/configure.in

@@ -95 +95 @@
 )
 
-dnl a mechanism to turn off threads in the client library
-AC_ARG_ENABLE(thread-safety,
-[  --disable-thread-safety Disables thread safety in the client library],
-[if test "x$enableval" = "xno" ; then
-    CFLAGS="$CFLAGS -D__GEN_NULL_LOCKING__"
-    AC_MSG_RESULT(no)
-fi],
-[   CFLAGS="$CFLAGS -D__GEN_POSIX_LOCKING__"
-    AC_MSG_RESULT(yes) ]
-)
-
 dnl default paths:
 PVFS2_SRC_RELATIVE_TOP="${srcdir}/.."
@@ -165 +154 @@
 dnl make sure the libs exist and work
 AC_CHECK_LIB(pvfs2, PVFS_sys_create, ,
-    AC_MSG_ERROR("could not find libpvfs2... must specify path to PVFS2 installation or build tree with --with-pvfs2-build")
-    )
+    AC_MSG_ERROR("could not find libpvfs2... must specify path to PVFS2 installation or build tree with --with-pvfs2-build"), -lssl -lcrypto)
 
 MPI_INTELC=

branches/cu-security-branch/test/io/bmi/bench-initialize.c

@@ -172 +172 @@
     if (flags & BMI_INIT_SERVER)
     {
-        ret = BMI_initialize(NULL, NULL, 0);
-    }
-    else
-    {
-
-        ret = BMI_initialize(NULL, NULL, 0);
+        ret = BMI_initialize(method, local_address, BMI_INIT_SERVER);
+    }
+    else
+    {
+
+        ret = BMI_initialize(method, NULL, 0);
     }
     if (ret < 0)
@@ -351 +351 @@
         ret = BMI_post_sendunexpected(&bmi_id, server_array[i], &ret,
                                       sizeof(int), BMI_EXT_ALLOC, 0, NULL,
-                                      context, NULL);
+                                      context);
         if (ret == 0)
         {

branches/cu-security-branch/test/io/bmi/bench-initialize.h

@@ -12 +12 @@
 #include <mpi.h>
 #include "bench-args.h"
-#include "pvfs2.h"
 
 #ifndef __BENCH_INITIALIZE_H

branches/cu-security-branch/test/io/bmi/bench-mem.h

@@ -11 +11 @@
 #include <math.h>
 #include <mpi.h>
-#include "pvfs2.h"
 #include "bmi.h"
 

branches/cu-security-branch/test/io/bmi/module.mk.in

@@ -8 +8 @@
         $(DIR)/test-bmi-server-eagerbug.c \
         $(DIR)/test-bmi-server-list.c \
-        $(DIR)/test-bmi-s2s-a.c \
-        $(DIR)/test-bmi-s2s-b.c \
         $(DIR)/pingpong.c
 

branches/cu-security-branch/test/io/bmi/pingpong.c

@@ -23 +23 @@
 #include <math.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "gossip.h"
@@ -103 +102 @@
             ret = BMI_initialize(opts->method, opts->hostid, BMI_INIT_SERVER);
         else
-            ret = BMI_initialize(NULL, NULL, 0);
+            ret = BMI_initialize(opts->method, NULL, 0);
 
         if (ret < 0) {
@@ -258 +257 @@
         ret = BMI_post_send(&(op_id[SEND]), peer_addr, tx_msg,
                         msg_len, BMI_PRE_ALLOC, 0, NULL,
-                        *context, NULL);
+                        *context);
         if (ret < 0) {
                 fprintf(stderr, "BMI_post_send failure.\n");
@@ -288 +287 @@
                                 ret = BMI_post_recv(&(op_id[RECV]), peer_addr, recv_buffer,
                                                 bytes, &actual_size, BMI_PRE_ALLOC, i, NULL,
-                                                *context, NULL);
+                                                *context);
                     
                                 if (ret < 0) {
@@ -333 +332 @@
                         /* send the pong */
                         ret = BMI_post_send(&(op_id[SEND]), peer_addr, send_buffer,
-                                        bytes, BMI_PRE_ALLOC, i, NULL, *context, NULL);
+                                        bytes, BMI_PRE_ALLOC, i, NULL, *context);
                         if (ret < 0) {
                                 fprintf(stderr, "BMI_post_send failure.\n");
@@ -442 +441 @@
         /* post the test parameters */
         ret = BMI_post_sendunexpected(&(op_id[SEND]), peer_addr, tx_msg,
-                        msg_len, BMI_PRE_ALLOC, 0, NULL, *context, NULL);
+                        msg_len, BMI_PRE_ALLOC, 0, NULL, *context);
         if (ret < 0) {
                 fprintf(stderr, "BMI_post_sendunexpected failure.\n");
@@ -464 +463 @@
         /* post a recv for the ack */
         ret = BMI_post_recv(&(op_id[RECV]), peer_addr, recv_buffer,
-                        msg_len, &actual_size, BMI_PRE_ALLOC, 0, NULL, *context, NULL);
+                        msg_len, &actual_size, BMI_PRE_ALLOC, 0, NULL, *context);
         if (ret < 0) {
                 fprintf(stderr, "BMI_post_recv_failure.\n");
@@ -508 +507 @@
                         ret = BMI_post_recv(&(op_id[RECV]), peer_addr, recv_buffer,
                                         bytes, &actual_size, BMI_PRE_ALLOC, i,
-                                        NULL, *context, NULL);
+                                        NULL, *context);
             
                         if (ret < 0) {
@@ -518 +517 @@
                         if (opts->test == EXPECTED) {
                                 ret = BMI_post_send(&(op_id[SEND]), peer_addr, send_buffer,
-                                                bytes, BMI_PRE_ALLOC, i, NULL, *context, NULL);
+                                                bytes, BMI_PRE_ALLOC, i, NULL, *context);
                         } else {
                                 ret = BMI_post_sendunexpected(&(op_id[SEND]), peer_addr, 
                                                 send_buffer, bytes, BMI_PRE_ALLOC, i, 
-                                                NULL, *context, NULL);
+                                                NULL, *context);
                         }
                         if (ret < 0) {

branches/cu-security-branch/test/io/bmi/test-bmi-client-eagerbug.c

@@ -19 +19 @@
 #include <string.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "test-bmi.h"
@@ -136 +135 @@
     ret = BMI_post_sendunexpected(&(client_ops[1]), server_addr, my_req,
                                   sizeof(struct server_request), BMI_PRE_ALLOC,
-                                  0, in_test_user_ptr, context, NULL);
+                                  0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -170 +169 @@
     ret = BMI_post_recv(&(client_ops[0]), server_addr, my_ack,
                         sizeof(struct server_ack), &actual_size, BMI_PRE_ALLOC,
-                        0, in_test_user_ptr, context, NULL);
+                        0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -223 +222 @@
      */
     ret = BMI_post_send(&(client_ops[0]), server_addr, send_buffer,
-                        15000, BMI_PRE_ALLOC, 0, in_test_user_ptr, context, NULL);
+                        15000, BMI_PRE_ALLOC, 0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -258 +257 @@
     /* final send to test eager bug *****************************/
     ret = BMI_post_send(&(client_ops[0]), server_addr, testeagerbuf1,
-                        6, BMI_EXT_ALLOC, 1, NULL, context, NULL);
+                        6, BMI_EXT_ALLOC, 1, NULL, context);
     if (ret < 0)
     {
@@ -286 +285 @@
 
     ret = BMI_post_send(&(client_ops[0]), server_addr, testeagerbuf1,
-                        6, BMI_EXT_ALLOC, 1, NULL, context, NULL);
+                        6, BMI_EXT_ALLOC, 1, NULL, context);
     if (ret < 0)
     {

branches/cu-security-branch/test/io/bmi/test-bmi-client-list.c

@@ -19 +19 @@
 #include <string.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "test-bmi.h"
@@ -143 +142 @@
     ret = BMI_post_sendunexpected(&(client_ops[1]), server_addr, my_req,
                                   sizeof(struct server_request), BMI_PRE_ALLOC,
-                                  0, in_test_user_ptr, context, NULL);
+                                  0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -185 +184 @@
     ret = BMI_post_recv(&(client_ops[0]), server_addr, my_ack,
                         sizeof(struct server_ack), &actual_size, BMI_PRE_ALLOC,
-                        0, in_test_user_ptr, context, NULL);
+                        0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -268 +267 @@
                              (const void **) buffer_list, size_list, 3,
                              (MSG1_SIZE + MSG2_SIZE + MSG3_SIZE),
-                             BMI_PRE_ALLOC, 0, in_test_user_ptr, context, NULL);
+                             BMI_PRE_ALLOC, 0, in_test_user_ptr, context);
     if (ret < 0)
     {

branches/cu-security-branch/test/io/bmi/test-bmi-client.c

@@ -19 +19 @@
 #include <string.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "test-bmi.h"
@@ -135 +134 @@
     ret = BMI_post_sendunexpected(&(client_ops[1]), server_addr, my_req,
                                   sizeof(struct server_request), BMI_PRE_ALLOC,
-                                  0, in_test_user_ptr, context, NULL);
+                                  0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -177 +176 @@
     ret = BMI_post_recv(&(client_ops[0]), server_addr, my_ack,
                         sizeof(struct server_ack), &actual_size, BMI_PRE_ALLOC,
-                        0, in_test_user_ptr, context, NULL);
+                        0, in_test_user_ptr, context);
     if (ret < 0)
     {
@@ -238 +237 @@
      */
     ret = BMI_post_send(&(client_ops[0]), server_addr, send_buffer,
-                        15000, BMI_PRE_ALLOC, 0, in_test_user_ptr, context, NULL);
+                        15000, BMI_PRE_ALLOC, 0, in_test_user_ptr, context);
     if (ret < 0)
     {

branches/cu-security-branch/test/io/bmi/test-bmi-server-eagerbug.c

@@ -19 +19 @@
 #include <string.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "gossip.h"
@@ -158 +157 @@
     ret = BMI_post_send(&(server_ops[1]), client_addr, my_ack,
                         sizeof(struct server_ack), BMI_PRE_ALLOC, 0, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {
@@ -184 +183 @@
     ret = BMI_post_recv(&(server_ops[0]), client_addr, recv_buffer,
                         my_req->size, &actual_size, BMI_PRE_ALLOC, 0, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {
@@ -233 +232 @@
     ret = BMI_post_recv_list(&(server_ops_list[0]), client_addr, buffer_list1,
                         size_list1, 2, 6, &actual_size, BMI_EXT_ALLOC, 1, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {
@@ -276 +275 @@
     ret = BMI_post_recv_list(&(server_ops_list[0]), client_addr, buffer_list1,
                         size_list1, 2, 6, &actual_size, BMI_EXT_ALLOC, 1, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {

branches/cu-security-branch/test/io/bmi/test-bmi-server-list.c

@@ -19 +19 @@
 #include <string.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "gossip.h"
@@ -166 +165 @@
     ret = BMI_post_send(&(server_ops[1]), client_addr, my_ack,
                         sizeof(struct server_ack), BMI_PRE_ALLOC, 0, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {
@@ -192 +191 @@
     ret = BMI_post_recv_list(&(server_ops[0]), client_addr, buffer_list,
                              size_list, 2, my_req->size, &actual_size,
-                             BMI_PRE_ALLOC, 0, NULL, context, NULL);
+                             BMI_PRE_ALLOC, 0, NULL, context);
     if (ret < 0)
     {

branches/cu-security-branch/test/io/bmi/test-bmi-server.c

@@ -19 +19 @@
 #include <string.h>
 
-#include "pvfs2.h"
 #include "bmi.h"
 #include "gossip.h"
@@ -156 +155 @@
     ret = BMI_post_send(&(server_ops[1]), client_addr, my_ack,
                         sizeof(struct server_ack), BMI_PRE_ALLOC, 0, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {
@@ -182 +181 @@
     ret = BMI_post_recv(&(server_ops[0]), client_addr, recv_buffer,
                         my_req->size, &actual_size, BMI_PRE_ALLOC, 0, NULL,
-                        context, NULL);
+                        context);
     if (ret < 0)
     {

branches/cu-security-branch/test/io/buffer/trove-init.c

@@ -125 +125 @@
                               NULL,
                               trove_context,
-                              &op_id,
-                              NULL);
+                              &op_id);
     while (ret == 0) ret = trove_dspace_test(
         coll_id, op_id, trove_context, &count, NULL, NULL, &state,
@@ -141 +140 @@
     val.buffer_sz = sizeof(file_handle);
     ret = trove_keyval_write(coll_id, parent_handle, &key, &val,
-                                 0, NULL, NULL, trove_context, &op_id, NULL);
+                                 0, NULL, NULL, trove_context, &op_id);
     while (ret == 0) ret = trove_dspace_test(
          coll_id, op_id, trove_context, &count, NULL, NULL, &state,
@@ -182 +181 @@
                                    user_ptr_array,
                                    trove_context,
-                                   &op_id,
-                                   NULL);
+                                   &op_id);
         while (ret == 0) ret = trove_dspace_test(
             coll_id, op_id, trove_context, &count, NULL, NULL, &state,
@@ -197 +195 @@
 
     fprintf(stderr, "+++++++++++++++++++++++++++++++\n");
-    fprintf(stderr, "Trove init: coll_id=%d, handle=%lld, context=%d\n", coll_id, lld(parent_handle), (int)trove_context);
+    fprintf(stderr, "Trove init: coll_id=%d, handle=%lld, context=%d\n", coll_id, lld(parent_handle), trove_context);
 
         free(mybuffer);

branches/cu-security-branch/test/io/description/test-zero-fill.c

@@ -6 +6 @@
 #include <time.h>
 #include <unistd.h>
+#include <assert.h>
+
 #include "pvfs2-request.h"
 #include "pvfs2-sysint.h"
@@ -26 +28 @@
 
 int do_smallmem_noncontig_read(
-    PVFS_object_ref ref, PVFS_credentials * creds,
+    PVFS_object_ref ref, PVFS_credential * cred,
     int memsize,
     int chunks,
@@ -32 +34 @@
 
 int do_noncontig_read(
-    PVFS_object_ref ref, PVFS_credentials * creds, 
+    PVFS_object_ref ref, PVFS_credential * cred, 
     int chunks, 
     ...);
@@ -38 +40 @@
 int do_contig_read(
     PVFS_object_ref ref, 
-    PVFS_credentials * creds, 
+    PVFS_credential * cred, 
     PVFS_offset offset, 
     int length,
     PVFS_Request freq);
 
-int do_write(PVFS_object_ref ref, PVFS_credentials * creds,
+int do_write(PVFS_object_ref ref, PVFS_credential * cred,
              PVFS_offset offset, PVFS_size size, char * buff);
 
@@ -157 +159 @@
 
 int do_smallmem_noncontig_read(
-    PVFS_object_ref ref, PVFS_credentials * creds,
+    PVFS_object_ref ref, PVFS_credential * cred,
     int memsize,
     int chunks,
@@ -210 +212 @@
 
     res = PVFS_sys_read(
-        ref, readreq, 0, buff, memreq, creds, &io_resp, NULL);
+        ref, readreq, 0, buff, memreq, cred, &io_resp);
     if(res < 0)
     {
@@ -232 +234 @@
 
 int do_noncontig_read(
-    PVFS_object_ref ref, PVFS_credentials * creds, 
+    PVFS_object_ref ref, PVFS_credential * cred, 
     int chunks, 
     ...)
@@ -285 +287 @@
 
     res = PVFS_sys_read(
-        ref, readreq, 0, buff, memreq, creds, &io_resp, NULL);
+        ref, readreq, 0, buff, memreq, cred, &io_resp);
     if(res < 0)
     {
@@ -307 +309 @@
 int do_contig_read(
     PVFS_object_ref ref, 
-    PVFS_credentials * creds, 
+    PVFS_credential * cred, 
     PVFS_offset offset, 
     int length,
@@ -349 +351 @@
 
     res = PVFS_sys_read(
-        ref, readreq, offset, buff, memreq, creds, &io_resp, NULL);
+        ref, readreq, offset, buff, memreq, cred, &io_resp);
     if(res < 0)
     {
@@ -367 +369 @@
 }
 
-int do_write(PVFS_object_ref ref, PVFS_credentials * creds,
+int do_write(PVFS_object_ref ref, PVFS_credential * cred,
              PVFS_offset offset, PVFS_size size, char * buff)
 {
@@ -403 +405 @@
     res = PVFS_sys_write(
         ref, filereq, 
-        offset, buff, memreq, creds, &io_resp, NULL);
+        offset, buff, memreq, cred, &io_resp);
     if(res < 0)
     {
@@ -433 +435 @@
     PVFS_fs_id curfs;
     PVFS_sys_attr attr;
-    PVFS_credentials creds;
+    PVFS_credential *cred;
     PVFS_sys_dist * dist;
     int strip_size = 9;
@@ -502 +504 @@
                 before_len, dashes, after_len, dashes);
     }
-
-    res = PVFS_sys_lookup(curfs, "/", &creds, &lookup_resp, 0, NULL);
+    
+    cred = PVFS_util_gen_fake_credential();
+    assert(cred);
+
+    res = PVFS_sys_lookup(curfs, "/", cred, &lookup_resp, 0);
     if(res < 0)
     {
@@ -518 +523 @@
     }
 
-    PVFS_util_gen_credentials(&creds);
-
     attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
-    attr.owner = creds.uid;
-    attr.group = creds.gid;
+    attr.owner = cred->userid;
+    attr.group = cred->group_array[0];
     attr.perms = 1877;
     attr.atime = attr.ctime = attr.mtime = time(NULL);
@@ -534 +537 @@
 
     res = PVFS_sys_create(
-        zerofill_fname, lookup_resp.ref, attr, &creds, dist, &create_resp, NULL, NULL);
+        zerofill_fname, lookup_resp.ref, attr, cred, dist, NULL, &create_resp);
     if(res < 0)
     {
@@ -543 +546 @@
     half_strip = strip_size / 2;
 
-    do_write(create_resp.ref, &creds, 0, half_strip, as);
-
-    do_write(create_resp.ref, &creds, strip_size * 2, half_strip, bs);
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 0, strip_size + half_strip, NULL);
+    do_write(create_resp.ref, cred, 0, half_strip, as);
+
+    do_write(create_resp.ref, cred, strip_size * 2, half_strip, bs);
+
+    res = do_contig_read(
+        create_resp.ref, cred, 0, strip_size + half_strip, NULL);
     if(res < 0)
     {
@@ -555 +558 @@
         
     res = do_contig_read(
-        create_resp.ref, &creds, 0, strip_size + half_strip, PVFS_BYTE);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 
+        create_resp.ref, cred, 0, strip_size + half_strip, PVFS_BYTE);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, 
         (strip_size + half_strip), (strip_size + half_strip), NULL);
     if(res < 0)
@@ -570 +573 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds, 
+        create_resp.ref, cred, 
         (strip_size + half_strip), (strip_size + half_strip), PVFS_BYTE);
     if(res < 0)
@@ -578 +581 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds, 0, (strip_size * 3), NULL);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 0, (strip_size * 3), PVFS_BYTE);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 0, half_strip + 2, NULL);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 0, half_strip + 2, PVFS_BYTE);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, half_strip + 2, strip_size, NULL);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, half_strip + 2, strip_size, PVFS_BYTE);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, strip_size + 1, 3, NULL);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, strip_size + 1, 3, PVFS_BYTE);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 0, 2, NULL);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    res = do_contig_read(
-        create_resp.ref, &creds, 0, 2, PVFS_BYTE);
-    if(res < 0)
-    {
-        goto exit;
-    }
-
-    do_write(create_resp.ref, &creds, strip_size * 4, half_strip, cs);
-
-    res = do_contig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred, 0, (strip_size * 3), NULL);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, 0, (strip_size * 3), PVFS_BYTE);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, 0, half_strip + 2, NULL);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, 0, half_strip + 2, PVFS_BYTE);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, half_strip + 2, strip_size, NULL);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, half_strip + 2, strip_size, PVFS_BYTE);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, strip_size + 1, 3, NULL);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, strip_size + 1, 3, PVFS_BYTE);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, 0, 2, NULL);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    res = do_contig_read(
+        create_resp.ref, cred, 0, 2, PVFS_BYTE);
+    if(res < 0)
+    {
+        goto exit;
+    }
+
+    do_write(create_resp.ref, cred, strip_size * 4, half_strip, cs);
+
+    res = do_contig_read(
+        create_resp.ref, cred,
         (strip_size * 3 + half_strip), (strip_size + half_strip), NULL);
     if(res < 0)
@@ -658 +661 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         (strip_size * 3 + half_strip), (strip_size + half_strip), PVFS_BYTE);
     if(res < 0)
@@ -666 +669 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         0, (strip_size * 5), NULL);
     if(res < 0)
@@ -674 +677 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         0, (strip_size * 5), PVFS_BYTE);
     if(res < 0)
@@ -682 +685 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds, 
+        create_resp.ref, cred, 
         (strip_size + half_strip), (strip_size + half_strip), NULL);
     if(res < 0)
@@ -690 +693 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds, 
+        create_resp.ref, cred, 
         (strip_size + half_strip), (strip_size + half_strip), PVFS_BYTE);
     if(res < 0)
@@ -698 +701 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         0, (strip_size * 3), NULL);
     if(res < 0)
@@ -706 +709 @@
 
     res = do_contig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         0, (strip_size * 3), PVFS_BYTE);
     if(res < 0)
@@ -714 +717 @@
 
     res = do_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         2,
         0, strip_size + half_strip,
@@ -724 +727 @@
     
     res = do_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         2,
         0, strip_size,
@@ -734 +737 @@
 
     res = do_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         2,
         0, strip_size,
@@ -744 +747 @@
 
     res = do_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         2,
         strip_size, strip_size,
@@ -754 +757 @@
 
     res = do_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         9,
         2, 2,
@@ -771 +774 @@
 
     res = do_smallmem_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         strip_size,
         4,
@@ -784 +787 @@
     
     res = do_smallmem_noncontig_read(
-        create_resp.ref, &creds,
+        create_resp.ref, cred,
         strip_size,
         2,
@@ -797 +800 @@
         zerofill_fname,
         lookup_resp.ref,
-        &creds,
-        NULL);

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