From ed04267cdfa621537315c96af8eab207b6042019 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 29 Oct 2019 08:57:45 +0100 Subject: fs: ext4: remove unnecessarily clever file read ext4fs_read_file() tries to tries to bundle contiguous block reads into longer reads from the device. In barebox we cache in the block layer already, so this is unnecessary. Simplify the code by removing the bundled reads. Signed-off-by: Sascha Hauer --- fs/ext4/ext4fs.c | 59 ++++++-------------------------------------------------- 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index acecccd6b9..2d231d273a 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -55,12 +55,6 @@ int ext4fs_read_file(struct ext2fs_node *node, int pos, int log2blocksize = LOG2_EXT2_BLOCK_SIZE(node->data); int blocksize = 1 << (log2blocksize + DISK_SECTOR_BITS); unsigned int filesize = le32_to_cpu(node->inode.size); - int previous_block_number = -1; - int delayed_start = 0; - int delayed_extent = 0; - int delayed_skipfirst = 0; - int delayed_next = 0; - char *delayed_buf = NULL; short ret; struct ext_filesystem *fs = node->data->fs; @@ -75,6 +69,7 @@ int ext4fs_read_file(struct ext2fs_node *node, int pos, int blockoff = pos % blocksize; int blockend = blocksize; int skipfirst = 0; + blknr = read_allocated_block(node, i); if (blknr < 0) return blknr; @@ -95,59 +90,17 @@ int ext4fs_read_file(struct ext2fs_node *node, int pos, skipfirst = blockoff; blockend -= skipfirst; } + if (blknr) { - if (previous_block_number != -1) { - if (delayed_next == blknr) { - delayed_extent += blockend; - delayed_next += blockend >> SECTOR_BITS; - } else { /* spill */ - ret = ext4fs_devread(fs, delayed_start, - delayed_skipfirst, - delayed_extent, - delayed_buf); - if (ret) - return ret; - previous_block_number = blknr; - delayed_start = blknr; - delayed_extent = blockend; - delayed_skipfirst = skipfirst; - delayed_buf = buf; - delayed_next = blknr + - (blockend >> SECTOR_BITS); - } - } else { - previous_block_number = blknr; - delayed_start = blknr; - delayed_extent = blockend; - delayed_skipfirst = skipfirst; - delayed_buf = buf; - delayed_next = blknr + - (blockend >> SECTOR_BITS); - } + ret = ext4fs_devread(fs, blknr, skipfirst, blockend, buf); + if (ret) + return ret; } else { - if (previous_block_number != -1) { - /* spill */ - ret = ext4fs_devread(fs, delayed_start, - delayed_skipfirst, - delayed_extent, - delayed_buf); - if (ret) - return ret; - previous_block_number = -1; - } memset(buf, 0, blockend); } + buf += blocksize - skipfirst; } - if (previous_block_number != -1) { - /* spill */ - ret = ext4fs_devread(fs, delayed_start, - delayed_skipfirst, delayed_extent, - delayed_buf); - if (ret) - return ret; - previous_block_number = -1; - } return len; } -- cgit v1.2.3