diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2012-03-29 00:35:09 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-02 04:31:48 +0100 |
commit | 79c806cb404c2d85aeec45b40ea6adbeae9f6346 (patch) | |
tree | 5627bb72a24373b931e6a3d4190335bc904cfd88 /meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0017-Fix-file-same-comparison.patch | |
parent | 84b7541abc2d7e59c22891219fce97d320d3bb33 (diff) | |
download | poky-79c806cb404c2d85aeec45b40ea6adbeae9f6346.tar.gz |
genext2fs: support large files and filesystems without using large amounts of memory
update_to_1.95.patch was generated by making a diff bewteen the 1.4.1 release
and the latest 1.9.5 version in the cvs repo:
http://genext2fs.cvs.sourceforge.net/viewvc/genext2fs/genext2fs/genext2fs.c?revision=1.95
The patches 0001-0019 come from mailing list of genext2fs-devel
http://sourceforge.net/mailarchive/forum.php?forum_name=genext2fs-devel&max_rows=100&style=flat&viewmonth=201106
(From OE-Core rev: 8f17e499cf91191727c8767e839738cb39c21655)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0017-Fix-file-same-comparison.patch')
-rw-r--r-- | meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0017-Fix-file-same-comparison.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0017-Fix-file-same-comparison.patch b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0017-Fix-file-same-comparison.patch new file mode 100644 index 0000000000..40a7807b0d --- /dev/null +++ b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0017-Fix-file-same-comparison.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Upstream-Status: inappropriate | ||
2 | |||
3 | From 33c92a0b663d16d2260b391d39aa745acd4b360e Mon Sep 17 00:00:00 2001 | ||
4 | From: Corey Minyard <cminyard@mvista.com> | ||
5 | Date: Tue, 7 Jun 2011 07:23:23 -0500 | ||
6 | Subject: [PATCH 17/19] Fix "file same" comparison | ||
7 | |||
8 | It's not enough to check the inode, you also have to check the device | ||
9 | to make sure a file is the same. | ||
10 | --- | ||
11 | genext2fs.c | 3 ++- | ||
12 | 1 files changed, 2 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/genext2fs.c b/genext2fs.c | ||
15 | index fc7fe5f..485393c 100644 | ||
16 | --- a/genext2fs.c | ||
17 | +++ b/genext2fs.c | ||
18 | @@ -2359,7 +2359,8 @@ alloc_fs(int swapit, char *fname, uint32 nbblocks, FILE *srcfile) | ||
19 | perror_msg_and_die("fstat srcfile"); | ||
20 | if (stat(fname, &dststat)) | ||
21 | perror_msg_and_die("stat-ing %s", fname); | ||
22 | - if (srcstat.st_ino == dststat.st_ino) { | ||
23 | + if (srcstat.st_ino == dststat.st_ino | ||
24 | + && srcstat.st_dev == dststat.st_dev) { | ||
25 | // source and destination are the same file, don't | ||
26 | // truncate or copy, just use the file. | ||
27 | fs->f = fopen(fname, "r+b"); | ||
28 | -- | ||
29 | 1.7.4.1 | ||
30 | |||