[Pvfs2-cvs] commit by kunkel in pvfs2/src/io/trove/trove-handle-mgmt: trove-extentlist.c trove-handle-mgmt.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove/trove-handle-mgmt
In directory parlweb1:/tmp/cvs-serv2872/src/io/trove/trove-handle-mgmt

Modified Files:
      Tag: kunkel-migration-branch
	trove-extentlist.c trove-handle-mgmt.c 
Log Message:
Update migration branch to current CVS version


Index: trove-extentlist.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-handle-mgmt/trove-extentlist.c,v
diff -p -u -r1.33 -r1.33.22.1
--- trove-extentlist.c	14 Dec 2005 21:50:29 -0000	1.33
+++ trove-extentlist.c	17 Feb 2007 11:16:22 -0000	1.33.22.1
@@ -482,7 +482,7 @@ void extentlist_count(
 
 static void extent_show(struct avlnode *n, int param, int depth)
 {
-    struct TROVE_handle_extent *e =
+    struct TROVE_handle_extent *e __attribute__((unused)) =
         (struct TROVE_handle_extent *)(n->d);
 
     gossip_debug(GOSSIP_TROVE_DEBUG, "lb: %llu ub: %llu\n",

Index: trove-handle-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-handle-mgmt/trove-handle-mgmt.c,v
diff -p -u -r1.44 -r1.44.22.1
--- trove-handle-mgmt.c	11 Nov 2005 21:31:06 -0000	1.44
+++ trove-handle-mgmt.c	17 Feb 2007 11:16:23 -0000	1.44.22.1
@@ -80,14 +80,25 @@ static int trove_check_handle_ranges(TRO
                                         TROVE_DEFAULT_TEST_TIMEOUT);
             }
 
-            if (ret != 1)
+            /* check result of testing */
+            if (ret < 0)
             {
                 gossip_debug(GOSSIP_TROVE_DEBUG,
-                             "trove_dspace_iterate_handles failed\n");
-                return -1;
+                             "dspace test of iterate_handles failed\n");
+                return ret;
             }
 
             ret = 0;
+
+            /* also check result of actual operation, in this case,
+             * trove_dspace_iterate_handles
+             */
+            if(state < 0)
+            {
+                gossip_debug(GOSSIP_TROVE_DEBUG,
+                             "trove_dspace_iterate_handles failed\n");
+                return state;
+            }
 
             /* look for special case of a blank fs */
             if ((count == 1) && (handles[0] == 0))