summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-01-01 01:25:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 11:13:57 +0000
commit63281708fab30adc4ca1a506deefbf8a54dcce6d (patch)
treebf6b9b48314909bd062f4fba473708065cbd6c81 /meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch
parent5ddb7d4ebb135e288ab56b44aceabb3578ae9ed1 (diff)
downloadpoky-63281708fab30adc4ca1a506deefbf8a54dcce6d.tar.gz
e2fsprogs: upgrade to 1.42.9
* Upgrade to 1.42.9 * Remove the following patches since they have been merged/fixed by upstream: - debugfs-extent-header.patch - debugfs-sparse-copy.patch - debugfs-too-short.patch - e2fsprogs-fix-tests-f_extent_oobounds.patch - fallocate.patch * The populate-extfs.sh had been merged by the upstream, but I'd like to go on using the previous one which is from our meta layer, they are a little different, and the script would be dropped when we use the mke2fs to populate the rootfs. * Sumitted the patch for populate-extfs.sh (from Søren Holm) to upstream. * Submitted fix-icache.patch to upstream, I wrongly thought it was not applicable to the upstream, but it does. * Join the do_install() and do_install_append() together. (From OE-Core rev: 82cc941128f9eaf57c3a9a648fc58227f6c1956c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch
deleted file mode 100644
index ae44730192..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1debugfs: properly set up extent header in do_write
2
3do_write doesn't fully set up the first extent header on a new
4inode, so if we write a 0-length file, and don't write any data
5to the new file, we end up creating something that looks corrupt
6to kernelspace:
7
8EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0)
9
10Do something similar to ext4_ext_tree_init() here, and
11fill out the first extent header upon creation to avoid this.
12
13Upstream-Status: Backport
14
15Reported-by: Robert Yang <liezhi.yang@windriver.com>
16Signed-off-by: Eric Sandeen <sandeen@redhat.com>
17---
18 debugfs/debugfs.c | 13 ++++++++++++-
19 1 file changed, 12 insertions(+), 1 deletion(-)
20
21diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
22--- a/debugfs/debugfs.c
23+++ b/debugfs/debugfs.c
24@@ -1726,8 +1726,19 @@ void do_write(int argc, char *argv[])
25 inode.i_links_count = 1;
26 inode.i_size = statbuf.st_size;
27 if (current_fs->super->s_feature_incompat &
28- EXT3_FEATURE_INCOMPAT_EXTENTS)
29+ EXT3_FEATURE_INCOMPAT_EXTENTS) {
30+ int i;
31+ struct ext3_extent_header *eh;
32+
33+ eh = (struct ext3_extent_header *) &inode.i_block[0];
34+ eh->eh_depth = 0;
35+ eh->eh_entries = 0;
36+ eh->eh_magic = EXT3_EXT_MAGIC;
37+ i = (sizeof(inode.i_block) - sizeof(*eh)) /
38+ sizeof(struct ext3_extent);
39+ eh->eh_max = ext2fs_cpu_to_le16(i);
40 inode.i_flags |= EXT4_EXTENTS_FL;
41+ }
42 if (debugfs_write_new_inode(newfile, &inode, argv[0])) {
43 close(fd);
44 return;
45--
461.8.1.2
47