mount: add nosuid,nodev,noexec switches to /var/lock and /var/run

[elogind.git] / src / readahead-collect.c

diff --git a/src/readahead-collect.c b/src/readahead-collect.c
index 5c09f7a9e1df140b29f61585506476cacf7bbc19..a9f544dd3ac4a29e30df58b139642a3ef88daa9b 100644 (file)
--- a/src/readahead-collect.c
+++ b/src/readahead-collect.c
@@ -398,8 +398,8 @@ static int collect(const char *root) {
                         char_array_0(fn);
 
                         if ((k = readlink_malloc(fn, &p)) >= 0) {
-
                                 if (startswith(p, "/tmp") ||
+                                    endswith(p, " (deleted)") ||
                                     hashmap_get(files, p))
                                         /* Not interesting, or
                                          * already read */
@@ -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);