readahead: minor 32bit fixes

diff --git a/src/readahead-collect.c b/src/readahead-collect.c
index 5c09f7a9e1df140b29f61585506476cacf7bbc19..75e7a2870bad679b937dadfc38757dbd6252ccf8 100644 (file)
--- a/src/readahead-collect.c
+++ b/src/readahead-collect.c
@@ -435,7 +435,7 @@ done:
         on_ssd = fs_on_ssd(root) > 0;
         log_debug("On SSD: %s", yes_no(on_ssd));
 
         on_ssd = fs_on_ssd(root) > 0;
         log_debug("On SSD: %s", yes_no(on_ssd));
 

-        on_btrfs = statfs(root, &sfs) >= 0 && sfs.f_type == BTRFS_SUPER_MAGIC;
+        on_btrfs = statfs(root, &sfs) >= 0 && (long) sfs.f_type == (long) BTRFS_SUPER_MAGIC;

         log_debug("On btrfs: %s", yes_no(on_btrfs));
 
         asprintf(&pack_fn, "%s/.readahead", root);
         log_debug("On btrfs: %s", yes_no(on_btrfs));
 
         asprintf(&pack_fn, "%s/.readahead", root);

diff --git a/src/readahead-common.c b/src/readahead-common.c
index a8f6fb30f81a366550d24f0c58ffdf14d0370ea8..908935e28d4c7e03695d0d413ce2251e5fc047ab 100644 (file)
--- a/src/readahead-common.c
+++ b/src/readahead-common.c
@@ -49,7 +49,7 @@ int file_verify(int fd, const char *fn, off_t file_size_max, struct stat *st) {
         }
 
         if (st->st_size <= 0 || st->st_size > file_size_max) {
         }
 
         if (st->st_size <= 0 || st->st_size > file_size_max) {

-                log_debug("Not preloading file %s with size out of bounds %zi", fn, st->st_size);
+                log_debug("Not preloading file %s with size out of bounds %lli", fn, (unsigned long long) st->st_size);

                 return 0;
         }
 
                 return 0;
         }