diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-27 17:54:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-27 17:54:38 -0400 |
| commit | 350c44dfb99017e9147ee07d37a40626bde62250 (patch) | |
| tree | 2a69f066e782471f0ad9fd198e803430a046e47f /fs/ext4/ext4fs.c | |
| parent | 39984d22138339fb2b14b21de635ef177cce0c7a (diff) | |
| parent | 6cc8e545b79311de2dbf7f05291fc77a54ffea6b (diff) | |
Merge branch '2020-03-27-master-imports'
- Update a few MAINTAINERS entries
- cache alignment fix in ext4 code
- Two small test fixes
Diffstat (limited to 'fs/ext4/ext4fs.c')
| -rw-r--r-- | fs/ext4/ext4fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 1c616a26a27..966b427a974 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -288,7 +288,7 @@ int ext_cache_read(struct ext_block_cache *cache, lbaint_t block, int size) if (cache->buf && cache->block == block && cache->size == size) return 1; ext_cache_fini(cache); - cache->buf = malloc(size); + cache->buf = memalign(ARCH_DMA_MINALIGN, size); if (!cache->buf) return 0; if (!ext4fs_devread(block, 0, size, cache->buf)) { |