*
* - detect ssd on btrfs/lvm...
* - read ahead directories
- * - sd_readahead_cancel
* - gzip?
* - remount rw?
* - handle files where nothing is in mincore
static off_t arg_file_size_max = READAHEAD_FILE_SIZE_MAX;
static usec_t arg_timeout = 2*USEC_PER_MINUTE;
+/* Avoid collisions with the NULL pointer */
+#define SECTOR_TO_PTR(s) ULONG_TO_PTR((s)+1)
+#define PTR_TO_SECTOR(p) (PTR_TO_ULONG(p)-1)
+
static int btrfs_defrag(int fd) {
struct btrfs_ioctl_vol_args data;
static int collect(const char *root) {
enum {
- FD_FANOTIFY, /* Get the actualy fs events */
+ FD_FANOTIFY, /* Get the actual fs events */
FD_SIGNAL,
FD_INOTIFY, /* We get notifications to quit early via this fd */
_FD_MAX
ul = fd_first_block(m->fd);
- if ((k = hashmap_put(files, p, ULONG_TO_PTR(ul))) < 0) {
+ if ((k = hashmap_put(files, p, SECTOR_TO_PTR(ul))) < 0) {
log_warning("set_put() failed: %s", strerror(-k));
free(p);
}
log_debug("Writing Pack File...");
- on_ssd = fs_on_ssd(root) == 0;
+ 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;
j = ordered;
HASHMAP_FOREACH_KEY(q, p, files, i) {
j->path = p;
- j->block = PTR_TO_ULONG(q);
+ j->block = PTR_TO_SECTOR(q);
j++;
}