[Pvfs2-cvs] commit by nlmills in pvfs2/src/io/trove/trove-dbpf: .cvsignore dbpf-bstream-direct.c dbpf-bstream.c dbpf-dspace.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv1309/src/io/trove/trove-dbpf

Modified Files:
      Tag: cu-security-branch
	dbpf-bstream-direct.c dbpf-bstream.c dbpf-dspace.c 
Added Files:
      Tag: cu-security-branch
	.cvsignore 
Log Message:
revert cu-security-branch to before the attempted merge with Orange-Branch



Index: dbpf-bstream-direct.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-bstream-direct.c,v
diff -p -u -r1.14.22.2 -r1.14.22.3
--- dbpf-bstream-direct.c	2 Sep 2009 20:16:12 -0000	1.14.22.2
+++ dbpf-bstream-direct.c	21 May 2010 17:34:20 -0000	1.14.22.3
@@ -857,10 +857,7 @@ static int dbpf_bstream_direct_write_op_
                 gen_mutex_unlock(&dbpf_update_size_lock);
                 goto cache_put;
             }
-            if(qop_p->op.flags & TROVE_SYNC)
-            {
-                sync_required = 1;
-            }
+            sync_required = 1;
         }
         gen_mutex_unlock(&dbpf_update_size_lock);
 

Index: dbpf-bstream.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-bstream.c,v
diff -p -u -r1.80.10.2 -r1.80.10.3
--- dbpf-bstream.c	2 Sep 2009 20:16:12 -0000	1.80.10.2
+++ dbpf-bstream.c	21 May 2010 17:34:20 -0000	1.80.10.3
@@ -186,10 +186,7 @@ static void aio_progress_notification(un
                     gen_mutex_unlock(&dbpf_update_size_lock);
                     goto error_in_cleanup;
                 }
-                if(op_p->flags & TROVE_SYNC)
-                {
-                    sync_required = 1;
-                }
+                sync_required = 1;
             }
             gen_mutex_unlock(&dbpf_update_size_lock);
         }

Index: dbpf-dspace.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-dspace.c,v
diff -p -u -r1.153.2.3 -r1.153.2.4
--- dbpf-dspace.c	2 Sep 2009 20:16:12 -0000	1.153.2.3
+++ dbpf-dspace.c	21 May 2010 17:34:20 -0000	1.153.2.4
@@ -886,10 +886,9 @@ static int dbpf_dspace_iterate_handles_o
             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");
-                i--;
-                continue;
+                /* something is wrong with the result */
+                ret = -TROVE_EINVAL;
+                goto return_error;
             }
 
             op_p->u.d_iterate_handles.handle_array[i] =
@@ -905,26 +904,22 @@ static int dbpf_dspace_iterate_handles_o
          * the position to the next handle after the last one we
          * return
          */
-        sizeof_handle = sizeof(TROVE_handle);
-        sizeof_attr = sizeof(attr);
-        do
+        DB_MULTIPLE_KEY_NEXT(tmp_ptr, &data,
+                             tmp_handle, sizeof_handle,
+                             tmp_attr, sizeof_attr);
+        if(!tmp_ptr)
         {
-            /* 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));
+            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;
         goto return_ok;