2 files changed, 6 insertions, 5 deletions

diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
index 592e5115a561..f311bf084015 100644
--- a/fs/isofs/compress.c
+++ b/fs/isofs/compress.c
@@ -158,8 +158,8 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,
                                                "zisofs: zisofs_inflate returned"
                                                " %d, inode = %lu,"
                                                " page idx = %d, bh idx = %d,"
-                                               " avail_in = %d,"
-                                               " avail_out = %d\n",
+                                               " avail_in = %ld,"
+                                               " avail_out = %ld\n",
                                                zerr, inode->i_ino, curpage,
                                                curbh, stream.avail_in,
                                                stream.avail_out);
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index 0b9a1e44e833..5698dae5d92d 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -94,11 +94,12 @@ static int jffs2_zlib_compress(unsigned char *data_in,
 
         while (def_strm.total_out < *dstlen - STREAM_END_SPACE && def_strm.total_in < *sourcelen) {
                 def_strm.avail_out = *dstlen - (def_strm.total_out + STREAM_END_SPACE);
-                def_strm.avail_in = min((unsigned)(*sourcelen-def_strm.total_in), def_strm.avail_out);
-                jffs2_dbg(1, "calling deflate with avail_in %d, avail_out %d\n",
+                def_strm.avail_in = min_t(unsigned long,
+                        (*sourcelen-def_strm.total_in), def_strm.avail_out);
+                jffs2_dbg(1, "calling deflate with avail_in %ld, avail_out %ld\n",
                           def_strm.avail_in, def_strm.avail_out);
                 ret = zlib_deflate(&def_strm, Z_PARTIAL_FLUSH);
-                jffs2_dbg(1, "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",
+                jffs2_dbg(1, "deflate returned with avail_in %ld, avail_out %ld, total_in %ld, total_out %ld\n",
                           def_strm.avail_in, def_strm.avail_out,
                           def_strm.total_in, def_strm.total_out);
                 if (ret != Z_OK) {