Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6198805861ba
Choose a base ref
...
head repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 680aa8796751
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 23, 2019

  1. make_ext4fs: Fix issue with read-only filesystems 

    This may trip newer kernels, under some unknown circumstances.

As shown here:

[   10.016001] c7    604 EXT4-fs error (device sda45): ext4_has_uninit_itable:2895: comm mount: Inode table for bg 0 marked as needing zeroing

This happens with the google-walleye device, and unvalidated due to
lack of logs, might be affecting xiaomi-lavender
    @samueldr
    samueldr committed Nov 23, 2019
    Copy the full SHA
    bd0220a View commit details

  2. Merge pull request #54 from samueldr-wip/fix/make_ext4fs_workaround 

    make_ext4fs: Fix issue with read-only filesystems
    @samueldr
    samueldr authored Nov 23, 2019
    Copy the full SHA
    680aa87 View commit details
Showing with 48 additions and 0 deletions.
  1. +47 −0 overlay/make_ext4fs/0001-LEDE-We-need-to-set-EXT4_BG_INODE_ZEROED-on-at-least.patch
  2. +1 −0 overlay/make_ext4fs/default.nix
47 changes: 47 additions & 0 deletions overlay/make_ext4fs/0001-LEDE-We-need-to-set-EXT4_BG_INODE_ZEROED-on-at-least.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
From b3e643e488c0bd5f7f4797f43e7d765bf7c0a2f9 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 23 Nov 2019 17:25:09 -0500
Subject: [PATCH] [LEDE] We need to set EXT4_BG_INODE_ZEROED on at least Block
Group 0.

This bit says whether the inode table has been explicitly zeroed
or not. ext4 in the kernel now insists that this bit be set on
block group 0 at least.

Since we are creating the filesystem as a flat sparse file, by
definition, the inode tables are zeroed on creation.

* * *

Provenance information, for Mobile NixOS:

This patch comes from the OpenWRT forum.

* https://forum.openwrt.org/t/read-only-file-system-after-a-fresh-installation-of-lede-17-01-5/17242/8

The patch should come from:

* `tools/make-ext4fs/patches/200-set-EXT4_BG_INODE_ZEROED.patch`

Though, it seems it never has gone through to LEDE, neither into
OpenWRT's make_ext4fs project...
---
allocate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allocate.c b/allocate.c
index cca3dc1..80fcaa5 100644
--- a/allocate.c
+++ b/allocate.c
@@ -307,7 +307,7 @@ static void init_bg(struct block_group_info *bg, unsigned int i)
bg->first_free_block = 0;
bg->free_inodes = info.inodes_per_group;
bg->first_free_inode = 1;
- bg->flags = EXT4_BG_INODE_UNINIT;
+ bg->flags = EXT4_BG_INODE_UNINIT|EXT4_BG_INODE_ZEROED;

if (reserve_blocks(bg, bg->first_free_block, bg->header_blocks) < 0)
error("failed to reserve %u blocks in block group %u\n", bg->header_blocks, i);
--
2.23.0

1 change: 1 addition & 0 deletions overlay/make_ext4fs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
patches = [
./0001-uuid-add-facilities-to-parse-and-print-UUIDs.patch
./0002-make_ext4fs-allow-setting-a-specific-UUID.patch
./0001-LEDE-We-need-to-set-EXT4_BG_INODE_ZEROED-on-at-least.patch
];

buildInputs = [