diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-01-01 01:25:17 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:13:57 +0000 |
| commit | 63281708fab30adc4ca1a506deefbf8a54dcce6d (patch) | |
| tree | bf6b9b48314909bd062f4fba473708065cbd6c81 /meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch | |
| parent | 5ddb7d4ebb135e288ab56b44aceabb3578ae9ed1 (diff) | |
| download | poky-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/fix-icache.patch')
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch deleted file mode 100644 index ad4e3439f4..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch +++ /dev/null | |||
| @@ -1,69 +0,0 @@ | |||
| 1 | inode.c: only update the icache for ext2_inode | ||
| 2 | |||
| 3 | We only read the cache when: | ||
| 4 | |||
| 5 | bufsize == sizeof(struct ext2_inode) | ||
| 6 | |||
| 7 | then we should only update the cache in the same condition, otherwise | ||
| 8 | there would be errors, for example: | ||
| 9 | |||
| 10 | cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() | ||
| 11 | cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() | ||
| 12 | |||
| 13 | Then update the cache: | ||
| 14 | cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() | ||
| 15 | |||
| 16 | Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was | ||
| 17 | cached by bufsize = 156), so there would be errors. | ||
| 18 | |||
| 19 | Note: the upstream has changed the icache lot, so this patch is | ||
| 20 | inappropriate for the upstream, we can drop this patch when we update | ||
| 21 | the package. | ||
| 22 | |||
| 23 | Upstream-Status: [Inappropriate] | ||
| 24 | |||
| 25 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 26 | --- | ||
| 27 | lib/ext2fs/inode.c | 20 ++++++++++++-------- | ||
| 28 | 1 file changed, 12 insertions(+), 8 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c | ||
| 31 | --- a/lib/ext2fs/inode.c | ||
| 32 | +++ b/lib/ext2fs/inode.c | ||
| 33 | @@ -612,10 +612,12 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino, | ||
| 34 | #endif | ||
| 35 | |||
| 36 | /* Update the inode cache */ | ||
| 37 | - fs->icache->cache_last = (fs->icache->cache_last + 1) % | ||
| 38 | - fs->icache->cache_size; | ||
| 39 | - fs->icache->cache[fs->icache->cache_last].ino = ino; | ||
| 40 | - fs->icache->cache[fs->icache->cache_last].inode = *inode; | ||
| 41 | + if (bufsize == sizeof(struct ext2_inode)) { | ||
| 42 | + fs->icache->cache_last = (fs->icache->cache_last + 1) % | ||
| 43 | + fs->icache->cache_size; | ||
| 44 | + fs->icache->cache[fs->icache->cache_last].ino = ino; | ||
| 45 | + fs->icache->cache[fs->icache->cache_last].inode = *inode; | ||
| 46 | + } | ||
| 47 | |||
| 48 | return 0; | ||
| 49 | } | ||
| 50 | @@ -648,10 +650,12 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino, | ||
| 51 | |||
| 52 | /* Check to see if the inode cache needs to be updated */ | ||
| 53 | if (fs->icache) { | ||
| 54 | - for (i=0; i < fs->icache->cache_size; i++) { | ||
| 55 | - if (fs->icache->cache[i].ino == ino) { | ||
| 56 | - fs->icache->cache[i].inode = *inode; | ||
| 57 | - break; | ||
| 58 | + if (bufsize == sizeof(struct ext2_inode)) { | ||
| 59 | + for (i=0; i < fs->icache->cache_size; i++) { | ||
| 60 | + if (fs->icache->cache[i].ino == ino) { | ||
| 61 | + fs->icache->cache[i].inode = *inode; | ||
| 62 | + break; | ||
| 63 | + } | ||
| 64 | } | ||
| 65 | } | ||
| 66 | } else { | ||
| 67 | -- | ||
| 68 | 1.8.1.2 | ||
| 69 | |||
