aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-04-11 10:28:14 +0000
committerLuka Perkov <luka@openwrt.org>2015-04-11 10:28:14 +0000
commit4398ecd73dcf8554c0e495de082e4677440c1d5c (patch)
treee24faee648bd7fe02dcdb4a9f916f88324797735 /target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
parentadb7aa14be1321e4ee57b2564edeb558d7eedcda (diff)
downloadupstream-4398ecd73dcf8554c0e495de082e4677440c1d5c.tar.gz
upstream-4398ecd73dcf8554c0e495de082e4677440c1d5c.tar.bz2
upstream-4398ecd73dcf8554c0e495de082e4677440c1d5c.zip
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45375 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch')
-rw-r--r--target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
deleted file mode 100644
index cd02c13e0c..0000000000
--- a/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/drivers/mtd/ubi/attach.c
-+++ b/drivers/mtd/ubi/attach.c
-@@ -800,6 +800,13 @@ out_unlock:
- return err;
- }
-
-+static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech)
-+{
-+ return ech->padding1[0] == 'E' &&
-+ ech->padding1[1] == 'O' &&
-+ ech->padding1[2] == 'F';
-+}
-+
- /**
- * scan_peb - scan and process UBI headers of a PEB.
- * @ubi: UBI device description object
-@@ -830,9 +837,21 @@ static int scan_peb(struct ubi_device *u
- return 0;
- }
-
-- err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
-- if (err < 0)
-- return err;
-+ if (!ai->eof_found) {
-+ err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
-+ if (err < 0)
-+ return err;
-+
-+ if (ec_hdr_has_eof(ech)) {
-+ ubi_msg("EOF marker found, PEBs from %d will be erased",
-+ pnum);
-+ ai->eof_found = true;
-+ }
-+ }
-+
-+ if (ai->eof_found)
-+ err = UBI_IO_FF_BITFLIPS;
-+
- switch (err) {
- case 0:
- break;
---- a/drivers/mtd/ubi/ubi.h
-+++ b/drivers/mtd/ubi/ubi.h
-@@ -701,6 +701,7 @@ struct ubi_attach_info {
- int mean_ec;
- uint64_t ec_sum;
- int ec_count;
-+ bool eof_found;
- struct kmem_cache *aeb_slab_cache;
- };
-