[U-Boot] ext4: add support for filesystems without JOURNAL
diff mbox series

Message ID 20190621133535.673-1-m.szyprowski@samsung.com
State Accepted
Commit bd8fbd8a13b8a696aed312753f46432b19b61fd6
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] ext4: add support for filesystems without JOURNAL
Related show

Commit Message

Marek Szyprowski June 21, 2019, 1:35 p.m. UTC
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>
---
 fs/ext4/ext4_journal.c | 4 ++++
 fs/ext4/ext4_journal.h | 2 ++
 2 files changed, 6 insertions(+)

Comments

Lukasz Majewski June 24, 2019, 9:32 a.m. UTC | #1
On Fri, 21 Jun 2019 15:35:35 +0200
Marek Szyprowski <m.szyprowski@samsung.com> wrote:

> 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>
> ---
>  fs/ext4/ext4_journal.c | 4 ++++
>  fs/ext4/ext4_journal.h | 2 ++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
> index 6adbab93a68..3559daf11d2 100644
> --- a/fs/ext4/ext4_journal.c
> +++ b/fs/ext4/ext4_journal.c
> @@ -645,6 +645,10 @@ void ext4fs_update_journal(void)
>  	struct ext_filesystem *fs = get_fs();
>  	long int blknr;
>  	int i;
> +
> +	if (!(fs->sb->feature_compatibility &
> EXT4_FEATURE_COMPAT_HAS_JOURNAL))
> +		return;
> +
>  	ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO,
> &inode_journal); blknr = read_allocated_block(&inode_journal,
> jrnl_blk_idx++, NULL); update_descriptor_block(blknr);
> diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
> index c9cf195f333..43fb8e76641 100644
> --- a/fs/ext4/ext4_journal.h
> +++ b/fs/ext4/ext4_journal.h
> @@ -17,6 +17,8 @@
>  #ifndef __EXT4_JRNL__
>  #define __EXT4_JRNL__
>  
> +#define EXT4_FEATURE_COMPAT_HAS_JOURNAL		0x0004
> +
>  #define EXT2_JOURNAL_INO		8	/* Journal inode */
>  #define EXT2_JOURNAL_SUPERBLOCK	0	/* Journal
> Superblock number */ 

Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Tom Rini July 18, 2019, 11:56 p.m. UTC | #2
On Fri, Jun 21, 2019 at 03:35:35PM +0200, Marek Szyprowski wrote:

> 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>

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 6adbab93a68..3559daf11d2 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -645,6 +645,10 @@  void ext4fs_update_journal(void)
 	struct ext_filesystem *fs = get_fs();
 	long int blknr;
 	int i;
+
+	if (!(fs->sb->feature_compatibility & EXT4_FEATURE_COMPAT_HAS_JOURNAL))
+		return;
+
 	ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal);
 	blknr = read_allocated_block(&inode_journal, jrnl_blk_idx++, NULL);
 	update_descriptor_block(blknr);
diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
index c9cf195f333..43fb8e76641 100644
--- a/fs/ext4/ext4_journal.h
+++ b/fs/ext4/ext4_journal.h
@@ -17,6 +17,8 @@ 
 #ifndef __EXT4_JRNL__
 #define __EXT4_JRNL__
 
+#define EXT4_FEATURE_COMPAT_HAS_JOURNAL		0x0004
+
 #define EXT2_JOURNAL_INO		8	/* Journal inode */
 #define EXT2_JOURNAL_SUPERBLOCK	0	/* Journal  Superblock number */