The unified diff between revisions [6d9381f5..] and [f35cd536..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/fs/diskd/store_dir_diskd.c'

#
#
# patch "src/fs/diskd/store_dir_diskd.c"
#  from [914cb5910c1c7948856f7c7ecf30cdb7f32a6b47]
#    to [29790dc96bd0f60cad3f36d201be8a32655cf28d]
#
============================================================
--- src/fs/diskd/store_dir_diskd.c	914cb5910c1c7948856f7c7ecf30cdb7f32a6b47
+++ src/fs/diskd/store_dir_diskd.c	29790dc96bd0f60cad3f36d201be8a32655cf28d
@@ -1820,25 +1820,25 @@ storeDiskdDirMaintain(SwapDir * SD)
  * object is able to be stored on this filesystem. DISKD filesystems will
  * happily store anything as long as the LRU time isn't too small.
  */
-int
+char
 storeDiskdDirCheckObj(SwapDir * SD, const StoreEntry * e)
 {
     diskdinfo_t *diskdinfo = SD->fsdata;
     /* Check the queue length */
     if (diskdinfo->away >= diskdinfo->magic1)
-	return -1;
-    /* Calculate the storedir load relative to magic2 on a scale of 0 .. 1000 */
-    /* the parse function guarantees magic2 is positivie */
-    return diskdinfo->away * 1000 / diskdinfo->magic2;
+	return 0;
+    return 1;
 }

-char
+int
 storeDiskdDirCheckLoadAv(SwapDir *SD, store_op_t op)
 {
     diskdinfo_t *diskdinfo = SD->fsdata;
+    /* Calculate the storedir load relative to magic2 on a scale of 0 .. 1000 */
+    /* the parse function guarantees magic2 is positivie */
     if (diskdinfo->away >= diskdinfo->magic1)
-        return 0;
-    return 1;
+	return -1;
+    return diskdinfo->away * 1000 / diskdinfo->magic2;
 }

 /*