diff options
Diffstat (limited to 'meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-add-a-commment-and-fix-some-other-comments.patch')
-rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-add-a-commment-and-fix-some-other-comments.patch | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-add-a-commment-and-fix-some-other-comments.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-add-a-commment-and-fix-some-other-comments.patch index fa075f9e7d..9d3a300a03 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-add-a-commment-and-fix-some-other-comments.patch +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-add-a-commment-and-fix-some-other-comments.patch | |||
@@ -1,13 +1,23 @@ | |||
1 | From 376dcb8ce2c9a6dab59e0a62a86549a490dee014 Mon Sep 17 00:00:00 2001 | ||
2 | From: "yanjun.zhu" <yanjun.zhu@windriver.com> | ||
3 | Date: Wed, 20 May 2015 18:16:53 +0200 | ||
4 | Subject: [PATCH 1/4] Add a comment and fix some other comments | ||
5 | |||
1 | Upstream-Status: Backport | 6 | Upstream-Status: Backport |
2 | 7 | ||
3 | unsquashfs: add a commment and fix some other comments | 8 | unsquashfs: add a commment and fix some other comments |
4 | 9 | ||
5 | Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> | 10 | Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> |
11 | Signed-off-by: Martin Jansa <martin.jansa@lge.com> | ||
12 | --- | ||
13 | squashfs-tools/unsquashfs.c | 8 ++++++-- | ||
14 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
6 | 15 | ||
7 | diff -urpN a/unsquashfs.c b/unsquashfs.c | 16 | diff --git a/unsquashfs.c b/unsquashfs.c |
8 | --- a/unsquashfs.c 2012-11-30 15:27:14.000000000 +0800 | 17 | index 529dfac..4f26e18 100644 |
9 | +++ b/unsquashfs.c 2012-11-30 15:27:56.000000000 +0800 | 18 | --- a/unsquashfs.c |
10 | @@ -814,7 +814,7 @@ int write_file(struct inode *inode, char | 19 | +++ b/unsquashfs.c |
20 | @@ -814,7 +814,7 @@ int write_file(struct inode *inode, char *pathname) | ||
11 | 21 | ||
12 | /* | 22 | /* |
13 | * the writer thread is queued a squashfs_file structure describing the | 23 | * the writer thread is queued a squashfs_file structure describing the |
@@ -16,7 +26,7 @@ diff -urpN a/unsquashfs.c b/unsquashfs.c | |||
16 | * queued separately (references to blocks in the cache). | 26 | * queued separately (references to blocks in the cache). |
17 | */ | 27 | */ |
18 | file->fd = file_fd; | 28 | file->fd = file_fd; |
19 | @@ -838,7 +838,7 @@ int write_file(struct inode *inode, char | 29 | @@ -838,7 +838,7 @@ int write_file(struct inode *inode, char *pathname) |
20 | block->offset = 0; | 30 | block->offset = 0; |
21 | block->size = i == file_end ? inode->data & (block_size - 1) : | 31 | block->size = i == file_end ? inode->data & (block_size - 1) : |
22 | block_size; | 32 | block_size; |
@@ -25,7 +35,7 @@ diff -urpN a/unsquashfs.c b/unsquashfs.c | |||
25 | block->buffer = NULL; | 35 | block->buffer = NULL; |
26 | else { | 36 | else { |
27 | block->buffer = cache_get(data_cache, start, | 37 | block->buffer = cache_get(data_cache, start, |
28 | @@ -2161,6 +2161,10 @@ options: | 38 | @@ -2156,6 +2156,10 @@ options: |
29 | block_size = sBlk.s.block_size; | 39 | block_size = sBlk.s.block_size; |
30 | block_log = sBlk.s.block_log; | 40 | block_log = sBlk.s.block_log; |
31 | 41 | ||
@@ -36,3 +46,6 @@ diff -urpN a/unsquashfs.c b/unsquashfs.c | |||
36 | fragment_buffer_size <<= 20 - block_log; | 46 | fragment_buffer_size <<= 20 - block_log; |
37 | data_buffer_size <<= 20 - block_log; | 47 | data_buffer_size <<= 20 - block_log; |
38 | initialise_threads(fragment_buffer_size, data_buffer_size); | 48 | initialise_threads(fragment_buffer_size, data_buffer_size); |
49 | -- | ||
50 | 2.1.4 | ||
51 | |||