Adopted redundant cache read in lfs_file_relocate

Previously had some custom logic that could be reduced
geky · Jun 29, 2017 · 931442a · 931442a
1 parent 0e1022a
commit 931442a
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/lfs.c b/lfs.c
@@ -1207,14 +1207,10 @@ static int lfs_file_relocate(lfs_t *lfs, lfs_file_t *file) {
     // either read from dirty cache or disk
     for (lfs_off_t i = 0; i < file->off; i++) {
         uint8_t data;
-        if (file->cache.block == file->block && i >= file->cache.off) {
-            data = file->cache.buffer[i - file->cache.off];
-        } else {
-            // just read from disk
-            err = lfs_bd_read(lfs, file->block, i, &data, 1);
-            if (err) {
-                return err;
-            }
+        err = lfs_cache_read(lfs, &lfs->rcache, &file->cache,
+                file->block, i, &data, 1);
+        if (err) {
+            return err;
         }
 
         err = lfs_cache_prog(lfs, &lfs->pcache, &lfs->rcache,