From db22e586dabd1458a0a1f1df62f0c80617f61e2c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 29 May 2010 09:18:04 -0700 Subject: [PATCH] Make sure our idev_find() hashtable use is right. --- hlink.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hlink.c b/hlink.c index 9057a92d..179dd25c 100644 --- a/hlink.c +++ b/hlink.c @@ -57,7 +57,7 @@ static struct file_list *hlink_flist; void init_hard_links(void) { if (am_sender || protocol_version < 30) - dev_tbl = hashtable_create(16, SIZEOF_INT64 == 8); + dev_tbl = hashtable_create(16, 1); else if (inc_recurse) prior_hlinks = hashtable_create(1024, 0); } @@ -67,11 +67,12 @@ struct ht_int64_node *idev_find(int64 dev, int64 ino) static struct ht_int64_node *dev_node = NULL; struct hashtable *tbl; - if (!dev_node || dev_node->key != dev) { + /* Note that some OSes have a dev == 0, so increment to avoid storing a 0. */ + if (!dev_node || dev_node->key != dev+1) { /* We keep a separate hash table of inodes for every device. */ - dev_node = hashtable_find(dev_tbl, dev, 1); + dev_node = hashtable_find(dev_tbl, dev+1, 1); if (!(tbl = dev_node->data)) { - tbl = dev_node->data = hashtable_create(512, SIZEOF_INT64 == 8); + tbl = dev_node->data = hashtable_create(512, 1); if (DEBUG_GTE(HLINK, 3)) { rprintf(FINFO, "[%s] created hashtable for dev %s\n", -- 2.34.1