Changeset 9127

Timestamp:

11/08/11 14:50:22 (19 months ago)

Author:

jdenton

Message:

Corrected the return val that wasn't being defined when ucache was disabled.

Should now return the correct amount of data written regardless of ucache
enabled/disabled.

Files:

• branches/Orange-Branch/src/client/usrint/iocommon.c (modified) (7 diffs)

branches/Orange-Branch/src/client/usrint/iocommon.c

@@ -978 +978 @@
     void *user_mem = 0; /* Where to read/write */
     uint64_t user_mem_size = 0; /* How much to read/write */
+    uint32_t written = 0;
 
     /* Continue read/writing strips of data until the whole block completed */
@@ -1029 +1030 @@
 
         left -= user_mem_size;
-    }
-    return 1;
+        written += user_mem_size;
+    }
+    return written;
 }
 #endif /* PVFS_UCACHE_ENABLE */
@@ -1070 +1072 @@
     int req_size = 0; /* how many bytes request spans */
     uint32_t blk_size = CACHE_BLOCK_SIZE_K * 1024;
+    int written = 0;
 
     /* How many bytes does request span? */
@@ -1165 +1168 @@
                                 &scratch_ptr, 
                                 &scratch_left);
+                written += rc;
         }
         else /* Miss */
@@ -1177 +1181 @@
                                            1, 
                                            &vector);
+                written += rc;
             }
             if(which == 2) /* Write */
@@ -1217 +1222 @@
                                 &scratch_ptr, 
                                 &scratch_left);
+                written += rc;
             }
         }
@@ -1222 +1228 @@
         lock_unlock(get_lock(ureq[i].ublk_index));
     }
+    rc = written;
 #endif /* PVFS_UCACHE_ENABLE */
-    return req_size;
+    return rc;
 }