Squashed 'littlefs/' changes from 16ceb67..8e251dd

8e251dd Merge pull request #1110 from Ryan-CW-Code/perf_gc
25b9a4a Merge pull request #1109 from Ryan-CW-Code/never_read
2acf939 Merge pull request #1106 from littlefs-project/fix-make-build-dep
d5a86fd style: format code, limit to 80 columns.
2349ac8 perf: gc might try to populate the lookahead buffer each time
0755b00 refactor: value stored to 'diff' is never read
8365bbb make: Added missing BUILD_DEP include

git-subtree-dir: littlefs
git-subtree-split: 8e251dd675da00342d45dac78b6f627f119aed03

Author: geky-bot

Makefile

@@ -475,6 +475,7 @@ benchmarks-diff: $(BENCH_CSV)
 # rules
 -include $(DEP)
 -include $(TEST_DEP)
+-include $(BENCH_DEP)
 .SUFFIXES:
 .SECONDARY:
 

lfs.c

@@ -828,9 +828,6 @@ static int lfs_dir_getread(lfs_t *lfs, const lfs_mdir_t *dir,
                 size -= diff;
                 continue;
             }
-
-            // rcache takes priority
-            diff = lfs_min(diff, rcache->off-off);
         }
 
         // load to cache, first condition can no longer fail
@@ -5225,7 +5222,9 @@ static int lfs_fs_gc_(lfs_t *lfs) {
     }
 
     // try to populate the lookahead buffer, unless it's already full
-    if (lfs->lookahead.size < 8*lfs->cfg->lookahead_size) {
+    if (lfs->lookahead.size < lfs_min(
+            8 * lfs->cfg->lookahead_size,
+            lfs->block_count)) {
         err = lfs_alloc_scan(lfs);
         if (err) {
             return err;