fs: ext4: cache extent data

[J-u-boot.git] / fs / ext4 / ext4_common.c

diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index dac95453650c042ef2cc071b9a6ac94a8f007d5f..29308e3b44741b8ee484158223df5976d428980d 100644 (file)
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011 - 2012 Samsung Electronics
  * EXT4 filesystem implementation in Uboot by
@@ -15,14 +16,11 @@
  * Copyright (C) 2003, 2004  Free Software Foundation, Inc.
  *
  * ext4write : Based on generic ext4 protocol.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <ext_common.h>
 #include <ext4fs.h>
-#include <inttypes.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <stddef.h>
@@ -211,7 +209,7 @@ void put_ext4(uint64_t off, void *buf, uint32_t size)
        if ((startblock + (size >> log2blksz)) >
            (part_offset + fs->total_sect)) {
                printf("part_offset is " LBAFU "\n", part_offset);
-               printf("total_sector is %" PRIu64 "\n", fs->total_sect);
+               printf("total_sector is %llu\n", fs->total_sect);
                printf("error: overflow occurs\n");
                return;
        }
@@ -512,7 +510,8 @@ restart:
 
 restart_read:
        /* read the block no allocated to a file */
-       first_block_no_of_root = read_allocated_block(g_parent_inode, blk_idx);
+       first_block_no_of_root = read_allocated_block(g_parent_inode, blk_idx,
+                                                     NULL);
        if (first_block_no_of_root <= 0)
                goto fail;
 
@@ -648,7 +647,7 @@ static int search_dir(struct ext2_inode *parent_inode, char *dirname)
 
        /* get the block no allocated to a file */
        for (blk_idx = 0; blk_idx < directory_blocks; blk_idx++) {
-               blknr = read_allocated_block(parent_inode, blk_idx);
+               blknr = read_allocated_block(parent_inode, blk_idx, NULL);
                if (blknr <= 0)
                        goto fail;
 
@@ -945,7 +944,7 @@ int ext4fs_filename_unlink(char *filename)
 
        /* read the block no allocated to a file */
        for (blk_idx = 0; blk_idx < directory_blocks; blk_idx++) {
-               blknr = read_allocated_block(g_parent_inode, blk_idx);
+               blknr = read_allocated_block(g_parent_inode, blk_idx, NULL);
                if (blknr <= 0)
                        break;
                inodeno = unlink_filename(filename, blknr);
@@ -1524,7 +1523,7 @@ void ext4fs_allocate_blocks(struct ext2_inode *file_inode,
 #endif
 
 static struct ext4_extent_header *ext4fs_get_extent_block
-       (struct ext2_data *data, char *buf,
+       (struct ext2_data *data, struct ext_block_cache *cache,
                struct ext4_extent_header *ext_block,
                uint32_t fileblock, int log2_blksz)
 {
@@ -1553,12 +1552,10 @@ static struct ext4_extent_header *ext4fs_get_extent_block
 
                block = le16_to_cpu(index[i].ei_leaf_hi);
                block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo);
-
-               if (ext4fs_devread((lbaint_t)block << log2_blksz, 0, blksz,
-                                  buf))
-                       ext_block = (struct ext4_extent_header *)buf;
-               else
+               block <<= log2_blksz;
+               if (!ext_cache_read(cache, (lbaint_t)block, blksz))
                        return NULL;
+               ext_block = (struct ext4_extent_header *)cache->buf;
        }
 }
 
@@ -1615,7 +1612,8 @@ int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode)
        return 1;
 }
 
-long int read_allocated_block(struct ext2_inode *inode, int fileblock)
+long int read_allocated_block(struct ext2_inode *inode, int fileblock,
+                             struct ext_block_cache *cache)
 {
        long int blknr;
        int blksz;
@@ -1632,20 +1630,26 @@ long int read_allocated_block(struct ext2_inode *inode, int fileblock)
 
        if (le32_to_cpu(inode->flags) & EXT4_EXTENTS_FL) {
                long int startblock, endblock;
-               char *buf = zalloc(blksz);
-               if (!buf)
-                       return -ENOMEM;
+               struct ext_block_cache *c, cd;
                struct ext4_extent_header *ext_block;
                struct ext4_extent *extent;
                int i;
+
+               if (cache) {
+                       c = cache;
+               } else {
+                       c = &cd;
+                       ext_cache_init(c);
+               }
                ext_block =
-                       ext4fs_get_extent_block(ext4fs_root, buf,
+                       ext4fs_get_extent_block(ext4fs_root, c,
                                                (struct ext4_extent_header *)
                                                inode->b.blocks.dir_blocks,
                                                fileblock, log2_blksz);
                if (!ext_block) {
                        printf("invalid extent block\n");
-                       free(buf);
+                       if (!cache)
+                               ext_cache_fini(c);
                        return -EINVAL;
                }
 
@@ -1657,19 +1661,22 @@ long int read_allocated_block(struct ext2_inode *inode, int fileblock)
 
                        if (startblock > fileblock) {
                                /* Sparse file */
-                               free(buf);
+                               if (!cache)
+                                       ext_cache_fini(c);
                                return 0;
 
                        } else if (fileblock < endblock) {
                                start = le16_to_cpu(extent[i].ee_start_hi);
                                start = (start << 32) +
                                        le32_to_cpu(extent[i].ee_start_lo);
-                               free(buf);
+                               if (!cache)
+                                       ext_cache_fini(c);
                                return (fileblock - startblock) + start;
                        }
                }
 
-               free(buf);
+               if (!cache)
+                       ext_cache_fini(c);
                return 0;
        }
 
@@ -2343,7 +2350,7 @@ int ext4fs_mount(unsigned part_length)
 
        /* Make sure this is an ext2 filesystem. */
        if (le16_to_cpu(data->sblock.magic) != EXT2_MAGIC)
-               goto fail;
+               goto fail_noerr;
 
 
        if (le32_to_cpu(data->sblock.revision_level) == 0) {
@@ -2379,6 +2386,7 @@ int ext4fs_mount(unsigned part_length)
        return 1;
 fail:
        printf("Failed to mount ext2 filesystem...\n");
+fail_noerr:
        free(data);
        ext4fs_root = NULL;