diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
| commit | 525753e4a1a139e088d8ac120b19fbab6c0aaaa6 (patch) | |
| tree | 35cef28abb613da4f58e83f6abbe4bd4cfa244bf /abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch | |
| parent | 592e3cad43ef12c53f523145d0fd981b54f2a049 (diff) | |
| parent | b172f79fadb565ecfbcec9508f9377d8618a4f4c (diff) | |
| download | linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.zip linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.gz linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch')
| -rw-r--r-- | abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch b/abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch new file mode 100644 index 0000000..e483c93 --- /dev/null +++ b/abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch @@ -0,0 +1,23 @@ +--- squashfs-tools/mksquashfs.c 2009-04-05 18:22:48.000000000 -0300 ++++ squashfs-tools/mksquashfs.c 2010-02-10 17:04:29.303757175 -0300 +@@ -1733,9 +1733,7 @@ + entry->buffer->block = bytes; + bytes += compressed_size; + fragments_outstanding --; +- pthread_mutex_unlock(&fragment_mutex); + queue_put(to_writer, entry->buffer); +- pthread_mutex_lock(&fragment_mutex); + TRACE("fragment_locked writing fragment %d, compressed size %d" + "\n", entry->fragment, compressed_size); + free(entry); +@@ -2426,8 +2424,8 @@ + write_buffer->block = bytes; + bytes += compressed_size; + fragments_outstanding --; +- pthread_mutex_unlock(&fragment_mutex); + queue_put(to_writer, write_buffer); ++ pthread_mutex_unlock(&fragment_mutex); + TRACE("Writing fragment %lld, uncompressed size %d, " + "compressed size %d\n", file_buffer->block, + file_buffer->size, compressed_size); + |