wok-next rev 20240
linux-cloop: tiny patch (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Nov 06 18:33:20 2017 +0100 (2017-11-06) |
parents | dda20bbe0a8e |
children | 020714e281b3 |
files | linux-cloop/stuff/cloop.u |
line diff
1.1 --- a/linux-cloop/stuff/cloop.u Mon Nov 06 18:03:36 2017 +0100 1.2 +++ b/linux-cloop/stuff/cloop.u Mon Nov 06 18:33:20 2017 +0100 1.3 @@ -1,6 +1,6 @@ 1.4 --- cloop.h 1.5 +++ cloop.h 1.6 -@@ -20,6 +20,80 @@ 1.7 +@@ -20,6 +20,81 @@ 1.8 /* data_index (num_blocks 64bit pointers, network order)... */ 1.9 /* compressed data (gzip block compressed format)... */ 1.10 1.11 @@ -18,6 +18,7 @@ 1.12 + u_int32_t optidx; /* 32-bit index number */ 1.13 +}; 1.14 + 1.15 ++#define ntohl be32_to_cpu 1.16 +static inline char *build_index(struct block_info *offsets, unsigned long n) 1.17 +{ 1.18 + u_int32_t *ofs32 = (u_int32_t *) offsets; 1.19 @@ -26,26 +27,26 @@ 1.20 + if (ofs32[0] == 0) { 1.21 + if (ofs32[2]) { /* ACCELERATED KNOPPIX V1.0 */ 1.22 + while (n--) { 1.23 -+ offsets[n].offset = __be64_to_cpu(offsets[n].offset); 1.24 ++ offsets[n].offset = be64_to_cpu(offsets[n].offset); 1.25 + offsets[n].size = ntohl(offsets[n].size); 1.26 + } 1.27 + return (char *) "128BE accelerated knoppix 1.0"; 1.28 + } 1.29 + else { /* V2.0 */ 1.30 -+ loff_t last = __be64_to_cpu(ofs64[n - 1]); 1.31 ++ loff_t last = be64_to_cpu(ofs64[n - 1]); 1.32 + while (n--) { 1.33 + offsets[n].size = last - 1.34 -+ (offsets[n].offset = __be64_to_cpu(ofs64[n])); 1.35 ++ (offsets[n].offset = be64_to_cpu(ofs64[n])); 1.36 + last = offsets[n].offset; 1.37 + } 1.38 + return (char *) "64BE v2.0"; 1.39 + } 1.40 + } 1.41 + else if (ofs32[1] == 0) { /* V1.0 */ 1.42 -+ loff_t last = __le64_to_cpu(ofs64[n - 1]); 1.43 ++ loff_t last = le64_to_cpu(ofs64[n - 1]); 1.44 + while (n--) { 1.45 + offsets[n].size = last - 1.46 -+ (offsets[n].offset = __le64_to_cpu(ofs64[n])); 1.47 ++ (offsets[n].offset = le64_to_cpu(ofs64[n])); 1.48 + last = offsets[n].offset; 1.49 + } 1.50 + return (char *) "64LE v1.0";