mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 93c33e6a7f3b0aef99d02252e6232a3d8b80f2d5 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 21 Jan 2018 15:47:50 +0100
|
|
Subject: ubifs: Add option to create UBI FS version 4 on empty UBI volume
|
|
|
|
Instead of creating an ubifs file system with format version 5 by
|
|
default on empty UBI volumes add a compile option to create an older ubi
|
|
with file system format version 4 instated. This allows it to be mount
|
|
as a volume on kernel versions < 4.10, which does not support format
|
|
version 5.
|
|
We saw that some people can not access their older data when they
|
|
downgraded from kernel 4.14 to kernel 4.9 to prevent this this option
|
|
would help.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
fs/ubifs/Kconfig | 13 +++++++++++++
|
|
fs/ubifs/sb.c | 6 ++++++
|
|
2 files changed, 19 insertions(+)
|
|
|
|
--- a/fs/ubifs/Kconfig
|
|
+++ b/fs/ubifs/Kconfig
|
|
@@ -85,3 +85,16 @@ config UBIFS_FS_SECURITY
|
|
the extended attribute support in advance.
|
|
|
|
If you are not using a security module, say N.
|
|
+
|
|
+config UBIFS_FS_FORMAT4
|
|
+ bool "Use file system format version 4 for new file systems"
|
|
+ depends on UBIFS_FS
|
|
+ help
|
|
+ Instead of creating new file systems with the new ubifs file
|
|
+ system version 5, use the old format version 4 for implicitly
|
|
+ by the driver created file systems on an empty UBI volume. This
|
|
+ makes it possible to mount these file systems also with kernel
|
|
+ versions before 4.10. The driver will still support file system
|
|
+ format version 5 for ubifs file systems created with version 5.
|
|
+
|
|
+ If you are unsure, say N.
|
|
--- a/fs/ubifs/sb.c
|
|
+++ b/fs/ubifs/sb.c
|
|
@@ -176,7 +176,9 @@ static int create_default_filesystem(str
|
|
tmp64 = (long long)max_buds * c->leb_size;
|
|
if (big_lpt)
|
|
sup_flags |= UBIFS_FLG_BIGLPT;
|
|
+#ifndef CONFIG_UBIFS_FS_FORMAT4
|
|
sup_flags |= UBIFS_FLG_DOUBLE_HASH;
|
|
+#endif
|
|
|
|
sup->ch.node_type = UBIFS_SB_NODE;
|
|
sup->key_hash = UBIFS_KEY_HASH_R5;
|
|
@@ -192,7 +194,11 @@ static int create_default_filesystem(str
|
|
sup->jhead_cnt = cpu_to_le32(DEFAULT_JHEADS_CNT);
|
|
sup->fanout = cpu_to_le32(DEFAULT_FANOUT);
|
|
sup->lsave_cnt = cpu_to_le32(c->lsave_cnt);
|
|
+#ifdef CONFIG_UBIFS_FS_FORMAT4
|
|
+ sup->fmt_version = cpu_to_le32(4);
|
|
+#else
|
|
sup->fmt_version = cpu_to_le32(UBIFS_FORMAT_VERSION);
|
|
+#endif
|
|
sup->time_gran = cpu_to_le32(DEFAULT_TIME_GRAN);
|
|
if (c->mount_opts.override_compr)
|
|
sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
|