# HG changeset patch # User Pascal Bellard # Date 1453036988 -3600 # Node ID 74ce1799eee78448fbff25d2ed15f2b92c44bc4a # Parent 8fe10eb4f215540cb4d741960868d7b93a526c9c cloop: deduplicate support (again) diff -r 8fe10eb4f215 -r 74ce1799eee7 fusecloop/stuff/fusecloop.u --- a/fusecloop/stuff/fusecloop.u Sun Jan 17 14:10:13 2016 +0100 +++ b/fusecloop/stuff/fusecloop.u Sun Jan 17 14:23:08 2016 +0100 @@ -68,7 +68,7 @@ + for (i = 0, j = sizeof(struct cloop_head); i < n; i++) { + offsets[i].offset = j; + if (offsets[i].size & 0x80000000) { -+ unsigned long k = offset[i].size & 0x7FFFFFFF; ++ unsigned long k = offsets[i].size & 0x7FFFFFFF; + offsets[i].offset = offsets[k].offset; + offsets[i].size = offsets[k].size; + } diff -r 8fe10eb4f215 -r 74ce1799eee7 linux-cloop/stuff/cloop.u --- a/linux-cloop/stuff/cloop.u Sun Jan 17 14:10:13 2016 +0100 +++ b/linux-cloop/stuff/cloop.u Sun Jan 17 14:23:08 2016 +0100 @@ -68,7 +68,7 @@ + for (i = 0, j = sizeof(struct cloop_head); i < n; i++) { + offsets[i].offset = j; + if (offsets[i].size & 0x80000000) { -+ unsigned long k = offset[i].size & 0x7FFFFFFF; ++ unsigned long k = offsets[i].size & 0x7FFFFFFF; + offsets[i].offset = offsets[k].offset; + offsets[i].size = offsets[k].size; + } diff -r 8fe10eb4f215 -r 74ce1799eee7 linux64-cloop/stuff/cloop.u --- a/linux64-cloop/stuff/cloop.u Sun Jan 17 14:10:13 2016 +0100 +++ b/linux64-cloop/stuff/cloop.u Sun Jan 17 14:23:08 2016 +0100 @@ -68,7 +68,7 @@ + for (i = 0, j = sizeof(struct cloop_head); i < n; i++) { + offsets[i].offset = j; + if (offsets[i].size & 0x80000000) { -+ unsigned long k = offset[i].size & 0x7FFFFFFF; ++ unsigned long k = offsets[i].size & 0x7FFFFFFF; + offsets[i].offset = offsets[k].offset; + offsets[i].size = offsets[k].size; + } diff -r 8fe10eb4f215 -r 74ce1799eee7 qemu/stuff/cloop.u --- a/qemu/stuff/cloop.u Sun Jan 17 14:10:13 2016 +0100 +++ b/qemu/stuff/cloop.u Sun Jan 17 14:23:08 2016 +0100 @@ -73,7 +73,7 @@ + for (i = 0, j = 128 + 4 + 4; i < n; i++) { + offsets[i].offset = j; + if (offsets[i].size & 0x80000000) { -+ unsigned long k = offset[i].size & 0x7FFFFFFF; ++ unsigned long k = offsets[i].size & 0x7FFFFFFF; + offsets[i].offset = offsets[k].offset; + offsets[i].size = offsets[k].size; + }