From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 30 Sep 2010 16:06:02 +0000 (+0200)
Subject: readahead: minor 32bit fixes
X-Git-Tag: v11~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5b61848df2ce706b9a2915ae180bced0e9debd34;ds=sidebyside

readahead: minor 32bit fixes
---

diff --git a/src/readahead-collect.c b/src/readahead-collect.c
index 5c09f7a9e..75e7a2870 100644
--- 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_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);
diff --git a/src/readahead-common.c b/src/readahead-common.c
index a8f6fb30f..908935e28 100644
--- 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) {
-                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;
         }