X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fmkresin.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpending-4.9%2F532-jffs2_eofdetect.patch;h=e9952c6d84528f30f914217864ee0cd74c62a13f;hp=3fc61c8cff5c20a657490e7ad4d487120287af3b;hb=2d02a4f5bda4a5ff392286360ec7d1129bd77d25;hpb=d9564d79b8e91eed23c45afd2eb4a71a97c922eb diff --git a/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch b/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch index 3fc61c8cff..e9952c6d84 100644 --- a/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch +++ b/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch @@ -7,11 +7,9 @@ Signed-off-by: Felix Fietkau fs/jffs2/scan.c | 21 +++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) -diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c -index b288c8ae1236..e768f9d41661 100644 --- a/fs/jffs2/build.c +++ b/fs/jffs2/build.c -@@ -117,6 +117,16 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c) +@@ -117,6 +117,16 @@ static int jffs2_build_filesystem(struct dbg_fsbuild("scanned flash completely\n"); jffs2_dbg_dump_block_lists_nolock(c); @@ -28,11 +26,9 @@ index b288c8ae1236..e768f9d41661 100644 dbg_fsbuild("pass 1 starting\n"); c->flags |= JFFS2_SB_FLAG_BUILDING; /* Now scan the directory tree, increasing nlink according to every dirent found. */ -diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c -index 90431dd613b8..8c78ab19cdab 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c -@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) +@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in /* reset summary info for next eraseblock scan */ jffs2_sum_reset_collected(s); @@ -49,7 +45,7 @@ index 90431dd613b8..8c78ab19cdab 100644 if (ret < 0) goto out; -@@ -561,6 +567,17 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo +@@ -561,6 +567,17 @@ full_scan: return err; } @@ -67,6 +63,3 @@ index 90431dd613b8..8c78ab19cdab 100644 /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ ofs = 0; max_ofs = EMPTY_SCAN_SIZE(c->sector_size); --- -2.11.0 -