leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: add support for filesystems without JOURNAL

Browse Source 
JOURNAL is optional for EXT4 (and EXT3) filesystems, so add support for
skipping it. This fixes corrupting EXT4 volumes without JOURNAL after
using uboot's 'ext4write' command.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Marek Szyprowski 2019-06-21 15:35:35 +02:00 committed by Tom Rini
parent 1c9f8f6412
commit bd8fbd8a13
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext4/ext4_journal.c
View File

@ -645,6 +645,10 @@ void ext4fs_update_journal(void)
struct ext_filesystem *fs = get_fs(); struct ext_filesystem *fs = get_fs();
long int blknr; long int blknr;
int i; int i;
if (!(fs->sb->feature_compatibility & EXT4_FEATURE_COMPAT_HAS_JOURNAL))
return;
ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal); ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal);
blknr = read_allocated_block(&inode_journal, jrnl_blk_idx++, NULL); blknr = read_allocated_block(&inode_journal, jrnl_blk_idx++, NULL);
update_descriptor_block(blknr); update_descriptor_block(blknr);

2
fs/ext4/ext4_journal.h
View File

@ -17,6 +17,8 @@
#ifndef __EXT4_JRNL__ #ifndef __EXT4_JRNL__
#define __EXT4_JRNL__ #define __EXT4_JRNL__
#define EXT4_FEATURE_COMPAT_HAS_JOURNAL 0x0004
#define EXT2_JOURNAL_INO 8 /* Journal inode */ #define EXT2_JOURNAL_INO 8 /* Journal inode */
#define EXT2_JOURNAL_SUPERBLOCK 0 /* Journal Superblock number */ #define EXT2_JOURNAL_SUPERBLOCK 0 /* Journal Superblock number */