evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

name cache: merged entry_has_expired() into entry_invis()

Browse source 
Signed-off-by: Casey Bodley <cbodley@umich.edu>
This commit is contained in:
Casey Bodley 2010-10-11 16:05:54 -04:00
parent bfae29e9c2
commit 6ee8bba79e
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
daemon/name_cache.c
View file

@ -558,28 +558,25 @@ out_success:
return entry; return entry;
} }
static int entry_has_expired(
IN struct name_cache_entry *entry)
{
/* invalidated by another entry or timer expired */
const int expired = entry->attributes->invalidated
|| time(NULL) > entry->expiration;
if (expired)
dprintf(NCLVL2, "entry_has_expired('%s')\n", entry->component);
return expired;
}
static int entry_invis( static int entry_invis(
IN struct name_cache_entry *entry, IN struct name_cache_entry *entry,
OUT OPTIONAL bool_t *is_negative) OUT OPTIONAL bool_t *is_negative)
{ {
if (entry_has_expired(entry)) /* name entry timer expired? */
if (time(NULL) > entry->expiration) {
dprintf(NCLVL2, "name_entry_expired('%s')\n", entry->component);
return 1; return 1;
}
/* a negative lookup entry has an empty fh and no attributes */ /* negative lookup entry? */
if (entry->attributes == NULL) { if (entry->attributes == NULL) {
if (is_negative) *is_negative = 1; if (is_negative) *is_negative = 1;
dprintf(NCLVL2, "name_entry_negative('%s')\n", entry->component);
return 1;
}
/* attribute entry invalidated? */
if (entry->attributes->invalidated) {
dprintf(NCLVL2, "attr_entry_expired(%llu)\n",
entry->attributes->fileid);
return 1; return 1;
} }
return 0; return 0;