Commit fb6af9f2 authored by Edward Shishkin's avatar Edward Shishkin Committed by james toy

This is a multi-part message in MIME format.

```-----------020703030905060904070706
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
```

-----------020703030905060904070706
Content-Type: text/plain;
 name="reiser4-fix-compile-warnings.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="reiser4-fix-compile-warnings.patch"

Fix compile warnings.

Prepared by: Brandon Berhent <cheater1034@gmail.com>
Signed-off-by: default avatarEdward Shishkin <edward.shishkin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f40c2f6d
...@@ -122,8 +122,8 @@ static int gzip1_min_size_deflate(void) ...@@ -122,8 +122,8 @@ static int gzip1_min_size_deflate(void)
} }
static void static void
gzip1_compress(coa_t coa, __u8 * src_first, unsigned src_len, gzip1_compress(coa_t coa, __u8 * src_first, size_t src_len,
__u8 * dst_first, unsigned *dst_len) __u8 * dst_first, size_t *dst_len)
{ {
#if REISER4_ZLIB #if REISER4_ZLIB
int ret = 0; int ret = 0;
...@@ -166,8 +166,8 @@ gzip1_compress(coa_t coa, __u8 * src_first, unsigned src_len, ...@@ -166,8 +166,8 @@ gzip1_compress(coa_t coa, __u8 * src_first, unsigned src_len,
} }
static void static void
gzip1_decompress(coa_t coa, __u8 * src_first, unsigned src_len, gzip1_decompress(coa_t coa, __u8 * src_first, size_t src_len,
__u8 * dst_first, unsigned *dst_len) __u8 * dst_first, size_t *dst_len)
{ {
#if REISER4_ZLIB #if REISER4_ZLIB
int ret = 0; int ret = 0;
...@@ -278,8 +278,8 @@ static int lzo1_min_size_deflate(void) ...@@ -278,8 +278,8 @@ static int lzo1_min_size_deflate(void)
} }
static void static void
lzo1_compress(coa_t coa, __u8 * src_first, unsigned src_len, lzo1_compress(coa_t coa, __u8 * src_first, size_t src_len,
__u8 * dst_first, unsigned *dst_len) __u8 * dst_first, size_t *dst_len)
{ {
int result; int result;
...@@ -302,8 +302,8 @@ lzo1_compress(coa_t coa, __u8 * src_first, unsigned src_len, ...@@ -302,8 +302,8 @@ lzo1_compress(coa_t coa, __u8 * src_first, unsigned src_len,
} }
static void static void
lzo1_decompress(coa_t coa, __u8 * src_first, unsigned src_len, lzo1_decompress(coa_t coa, __u8 * src_first, size_t src_len,
__u8 * dst_first, unsigned *dst_len) __u8 * dst_first, size_t *dst_len)
{ {
int result; int result;
......
...@@ -1014,7 +1014,7 @@ int reiser4_deflate_cluster(struct cluster_handle * clust, struct inode * inode) ...@@ -1014,7 +1014,7 @@ int reiser4_deflate_cluster(struct cluster_handle * clust, struct inode * inode)
coplug = inode_compression_plugin(inode); coplug = inode_compression_plugin(inode);
if (should_compress(tc, clust->index, inode)) { if (should_compress(tc, clust->index, inode)) {
/* try to compress, discard bad results */ /* try to compress, discard bad results */
__u32 dst_len; size_t dst_len;
compression_mode_plugin * mplug = compression_mode_plugin * mplug =
inode_compression_mode_plugin(inode); inode_compression_mode_plugin(inode);
assert("edward-602", coplug != NULL); assert("edward-602", coplug != NULL);
...@@ -1164,7 +1164,7 @@ int reiser4_inflate_cluster(struct cluster_handle * clust, struct inode * inode) ...@@ -1164,7 +1164,7 @@ int reiser4_inflate_cluster(struct cluster_handle * clust, struct inode * inode)
transformed = 1; transformed = 1;
} }
if (need_inflate(clust, inode, 0)) { if (need_inflate(clust, inode, 0)) {
unsigned dst_len = inode_cluster_size(inode); size_t dst_len = inode_cluster_size(inode);
if(transformed) if(transformed)
alternate_streams(tc); alternate_streams(tc);
......
...@@ -273,7 +273,7 @@ static int read_check_compressibility(struct inode * inode, ...@@ -273,7 +273,7 @@ static int read_check_compressibility(struct inode * inode,
{ {
int i; int i;
int result; int result;
__u32 dst_len; size_t dst_len;
hint_t tmp_hint; hint_t tmp_hint;
hint_t * cur_hint = clust->hint; hint_t * cur_hint = clust->hint;
assert("edward-1541", cont->state == DISPATCH_POINT); assert("edward-1541", cont->state == DISPATCH_POINT);
......
...@@ -233,8 +233,8 @@ struct dir_entry_iops { ...@@ -233,8 +233,8 @@ struct dir_entry_iops {
/* operations specific to items regular (unix) file metadata are built of */ /* operations specific to items regular (unix) file metadata are built of */
struct file_iops{ struct file_iops{
int (*write) (struct file *, struct inode *, ssize_t (*write) (struct file *, struct inode *,
const char __user *, size_t, loff_t *pos); const char __user *, size_t, loff_t *pos);
int (*read) (struct file *, flow_t *, hint_t *); int (*read) (struct file *, flow_t *, hint_t *);
int (*readpage) (void *, struct page *); int (*readpage) (void *, struct page *);
int (*get_block) (const coord_t *, sector_t, sector_t *); int (*get_block) (const coord_t *, sector_t, sector_t *);
......
...@@ -560,10 +560,10 @@ typedef struct compression_plugin { ...@@ -560,10 +560,10 @@ typedef struct compression_plugin {
int (*min_size_deflate) (void); int (*min_size_deflate) (void);
__u32(*checksum) (char *data, __u32 length); __u32(*checksum) (char *data, __u32 length);
/* main transform procedures */ /* main transform procedures */
void (*compress) (coa_t coa, __u8 *src_first, unsigned src_len, void (*compress) (coa_t coa, __u8 *src_first, size_t src_len,
__u8 *dst_first, unsigned *dst_len); __u8 *dst_first, size_t *dst_len);
void (*decompress) (coa_t coa, __u8 *src_first, unsigned src_len, void (*decompress) (coa_t coa, __u8 *src_first, size_t src_len,
__u8 *dst_first, unsigned *dst_len); __u8 *dst_first, size_t *dst_len);
} compression_plugin; } compression_plugin;
typedef struct compression_mode_plugin { typedef struct compression_mode_plugin {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment