@@ -111,7 +111,7 @@ static void fsentry_init(struct fsentry *fse, struct fsentry *list,
111
111
fse -> list = list ;
112
112
fse -> name = name ;
113
113
fse -> len = len ;
114
- hashmap_entry_init (fse , fsentry_hash (fse ));
114
+ hashmap_entry_init (& fse -> ent , fsentry_hash (fse ));
115
115
}
116
116
117
117
/*
@@ -328,7 +328,7 @@ static void fscache_add(struct fscache *cache, struct fsentry *fse)
328
328
fse = fse -> list ;
329
329
330
330
for (; fse ; fse = fse -> next )
331
- hashmap_add (& cache -> map , fse );
331
+ hashmap_add (& cache -> map , & fse -> ent );
332
332
}
333
333
334
334
/*
@@ -370,7 +370,7 @@ static struct fsentry *fscache_get(struct fscache *cache, struct fsentry *key)
370
370
371
371
cache -> fscache_requests ++ ;
372
372
/* check if entry is in cache */
373
- fse = hashmap_get (& cache -> map , key , NULL );
373
+ fse = hashmap_get_entry (& cache -> map , key , ent , NULL );
374
374
if (fse ) {
375
375
if (fse -> st_mode )
376
376
fsentry_addref (fse );
@@ -380,7 +380,7 @@ static struct fsentry *fscache_get(struct fscache *cache, struct fsentry *key)
380
380
}
381
381
/* if looking for a file, check if directory listing is in cache */
382
382
if (!fse && key -> list ) {
383
- fse = hashmap_get (& cache -> map , key -> list , NULL );
383
+ fse = hashmap_get_entry (& cache -> map , key -> list , ent , NULL );
384
384
if (fse ) {
385
385
/*
386
386
* dir entry without file entry, or dir does not
@@ -416,7 +416,7 @@ static struct fsentry *fscache_get(struct fscache *cache, struct fsentry *key)
416
416
417
417
/* lookup file entry if requested (fse already points to directory) */
418
418
if (key -> list )
419
- fse = hashmap_get (& cache -> map , key , NULL );
419
+ fse = hashmap_get_entry (& cache -> map , key , ent , NULL );
420
420
421
421
if (fse && !fse -> st_mode )
422
422
fse = NULL ; /* non-existing directory */
0 commit comments