diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:16:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:16:44 +0200 |
| commit | 6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72 (patch) | |
| tree | 432513fc67dcff844ecf5c48f38bdcf1a9fe3523 /package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch | |
| parent | b6ebab842dbb0581526f907bf5b39cad0ac1f756 (diff) | |
| parent | 0b79c5022d32b15180a18087a0fba5a2f1af5cc7 (diff) | |
Merge branch 'fs-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch')
| -rw-r--r-- | package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch b/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch new file mode 100644 index 000000000..7f8e8e074 --- /dev/null +++ b/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch @@ -0,0 +1,41 @@ +[PATCH]: fix mksquashfs race condition + +See http://thread.gmane.org/gmane.comp.file-systems.squashfs.devel/76 +for details. +--- + squashfs-tools/mksquashfs.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: squashfs4.0/squashfs-tools/mksquashfs.c +=================================================================== +--- squashfs4.0.orig/squashfs-tools/mksquashfs.c ++++ squashfs4.0/squashfs-tools/mksquashfs.c +@@ -1733,8 +1733,8 @@ void unlock_fragments() + entry->buffer->block = bytes; + bytes += compressed_size; + fragments_outstanding --; +- pthread_mutex_unlock(&fragment_mutex); + queue_put(to_writer, entry->buffer); ++ pthread_mutex_unlock(&fragment_mutex); + pthread_mutex_lock(&fragment_mutex); + TRACE("fragment_locked writing fragment %d, compressed size %d" + "\n", entry->fragment, compressed_size); +@@ -2426,8 +2426,8 @@ void *frag_deflator(void *arg) + 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); +@@ -4137,7 +4137,7 @@ void read_recovery_data(char *recovery_f + + + #define VERSION() \ +- printf("mksquashfs version 4.0 (2009/04/05)\n");\ ++ printf("mksquashfs version 4.0-test (2009/04/05)\n");\ + printf("copyright (C) 2009 Phillip Lougher <phillip@lougher.demon.co.uk>\n\n"); \ + printf("This program is free software; you can redistribute it and/or\n");\ + printf("modify it under the terms of the GNU General Public License\n");\ |