wok diff linux-cloop/stuff/cloop.u @ rev 18683
Add ipkungfu
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Dec 09 21:51:05 2015 +0100 (2015-12-09) |
parents | b30e264381c7 |
children | 8fe10eb4f215 |
line diff
1.1 --- a/linux-cloop/stuff/cloop.u Wed Nov 19 11:46:06 2014 +0100 1.2 +++ b/linux-cloop/stuff/cloop.u Wed Dec 09 21:51:05 2015 +0100 1.3 @@ -225,7 +225,7 @@ 1.4 if (!clo->offsets) 1.5 { 1.6 printk(KERN_ERR "%s: out of kernel mem for offsets\n", cloop_name); 1.7 -@@ -521,19 +571,19 @@ 1.8 +@@ -521,19 +571,22 @@ 1.9 } 1.10 num_readable = MIN(total_offsets - offsets_read, 1.11 (clo->underlying_blksize - offset) 1.12 @@ -247,12 +247,15 @@ 1.13 } 1.14 - printk(KERN_INFO "%s: %s: %u blocks, %u bytes/block, largest block is %lu bytes.\n", 1.15 - cloop_name, filename, ntohl(clo->head.num_blocks), 1.16 ++ i = ntohl(clo->head.block_size); 1.17 ++ i += i/1000 + 12 + 4; /* max gzip block size */ 1.18 ++ if (clo->largest_block > i) clo->largest_block = i; /* broken index ? */ 1.19 + printk(KERN_INFO "%s: %s: %s, %u blocks, %u bytes/block, largest block is %lu bytes.\n", 1.20 + cloop_name, filename, version, ntohl(clo->head.num_blocks), 1.21 ntohl(clo->head.block_size), clo->largest_block); 1.22 } 1.23 /* Combo kmalloc used too large chunks (>130000). */ 1.24 -@@ -565,16 +615,6 @@ 1.25 +@@ -565,16 +618,6 @@ 1.26 error=-ENOMEM; goto error_release_free_all; 1.27 } 1.28 zlib_inflateInit(&clo->zstream); 1.29 @@ -269,7 +272,7 @@ 1.30 { 1.31 int i; 1.32 for(i=0; i<BUFFERED_BLOCKS; i++) clo->buffered_blocknum[i] = -1; 1.33 -@@ -653,7 +693,7 @@ 1.34 +@@ -653,7 +696,7 @@ 1.35 } 1.36 } 1.37 error_release_free: