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/aufs/store_dir_aufs.c'

#
#
# patch "src/fs/aufs/store_dir_aufs.c"
#  from [323cdf961a164cc4a8a1a4c304b20a5bc5d86bd4]
#    to [434e3a5f048cd6111395e88fb1397144b4f2cc14]
#
============================================================
--- src/fs/aufs/store_dir_aufs.c	323cdf961a164cc4a8a1a4c304b20a5bc5d86bd4
+++ src/fs/aufs/store_dir_aufs.c	434e3a5f048cd6111395e88fb1397144b4f2cc14
@@ -1592,29 +1592,13 @@ storeAufsDirMaintain(SwapDir * SD)
  * object is able to be stored on this filesystem. AUFS filesystems will
  * happily store anything as long as the LRU time isn't too small.
  */
-int
+char
 storeAufsDirCheckObj(SwapDir * SD, const StoreEntry * e)
 {
-    int loadav;
-    int ql;
-
-#if OLD_UNUSED_CODE
-    if (storeAufsDirExpiredReferenceAge(SD) < 300) {
-	debug(47, 3) ("storeAufsDirCheckObj: NO: LRU Age = %d\n",
-	    storeAufsDirExpiredReferenceAge(SD));
-	/* store_check_cachable_hist.no.lru_age_too_low++; */
-	return -1;
-    }
-#endif
-    ql = aioQueueSize();
-    if (ql == 0)
-	loadav = 0;
-    loadav = ql * 1000 / MAGIC1;
-    debug(47, 9) ("storeAufsDirCheckObj: load=%d\n", loadav);
-    return loadav;
+    return 1;
 }

-char
+int
 storeAufsDirCheckLoadAv(SwapDir *SD, store_op_t op)
 {
 	int loadav, ql;
@@ -1624,7 +1608,7 @@ storeAufsDirCheckLoadAv(SwapDir *SD, sto
 		return 1;
 	}
 	loadav = ql * 1000 / MAGIC1;
-	return (loadav < 1000);
+	return loadav;
 }

 /*