diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-09-27 20:23:17 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-27 20:23:17 +0200 |
| commit | 2e7485f021e7771ba802ce2d5188a88baa63fe0e (patch) | |
| tree | afdbc85ed8df6f852664ea37cffbe043b64f9597 | |
| parent | aed5e44d50656fc5b07e47a717cfe57cc08adc0f (diff) | |
readahead: avoid collisions with the NULL pointer
| -rw-r--r-- | src/readahead-collect.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/readahead-collect.c b/src/readahead-collect.c index 50c1a0b684..c8b2cdcc52 100644 --- a/src/readahead-collect.c +++ b/src/readahead-collect.c @@ -64,6 +64,10 @@ static unsigned arg_files_max = 16*1024; 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; @@ -395,7 +399,7 @@ static int collect(const char *root) { 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); } @@ -468,7 +472,7 @@ done: 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++; } |