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

cache: check for expiry on nfs41_attr_cache_lookup()

Browse source 
added expiration field to struct attr_cache_entry.  expiration timer is reset whenever attr_cache_update() is called with a 'change' attribute

new function attr_cache_entry_expired() is used by nfs41_attr_cache_lookup() and name_cache_lookup()/entry_invis() to prevent the use of expired attributes

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2012-02-03 13:40:00 -05:00 • committed by unknown
parent b779ab07fc
commit 63f499c4b7
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/name_cache.c
View file

@ -95,6 +95,7 @@ struct attr_cache_entry {
uint32_t time_modify_ns; uint32_t time_modify_ns;
uint32_t numlinks; uint32_t numlinks;
uint32_t mode; uint32_t mode;
time_t expiration;
unsigned ref_count : 26; unsigned ref_count : 26;
unsigned type : 4; unsigned type : 4;
unsigned invalidated : 1; unsigned invalidated : 1;
@ -175,6 +176,13 @@ static __inline void attr_cache_entry_deref(
attr_cache_entry_free(cache, entry); attr_cache_entry_free(cache, entry);
} }
static __inline int attr_cache_entry_expired(
IN const struct attr_cache_entry *entry)
{
return entry->invalidated ||
(!entry->delegated && time(NULL) > entry->expiration);
}
/* attr_cache */ /* attr_cache */
static int attr_cache_init( static int attr_cache_init(
IN struct attr_cache *cache, IN struct attr_cache *cache,
@ -285,6 +293,7 @@ static void attr_cache_update(
entry->change = info->change; entry->change = info->change;
/* revalidate whenever we get a change attribute */ /* revalidate whenever we get a change attribute */
entry->invalidated = 0; entry->invalidated = 0;
entry->expiration = time(NULL) + NAME_CACHE_EXPIRATION;
} }
if (info->attrmask.arr[0] & FATTR4_WORD0_SIZE) if (info->attrmask.arr[0] & FATTR4_WORD0_SIZE)
entry->size = info->size; entry->size = info->size;
@ -610,8 +619,8 @@ static int entry_invis(
dprintf(NCLVL2, "name_entry_negative('%s')\n", entry->component); dprintf(NCLVL2, "name_entry_negative('%s')\n", entry->component);
return 1; return 1;
} }
/* attribute entry invalidated? */ /* attribute entry expired? */
if (entry->attributes->invalidated) { if (attr_cache_entry_expired(entry->attributes)) {
dprintf(NCLVL2, "attr_entry_expired(%llu)\n", dprintf(NCLVL2, "attr_entry_expired(%llu)\n",
entry->attributes->fileid); entry->attributes->fileid);
return 1; return 1;
@ -848,7 +857,7 @@ int nfs41_attr_cache_lookup(
} }
entry = attr_cache_search(&cache->attributes, fileid); entry = attr_cache_search(&cache->attributes, fileid);
if (entry == NULL) { if (entry == NULL || attr_cache_entry_expired(entry)) {
status = ERROR_FILE_NOT_FOUND; status = ERROR_FILE_NOT_FOUND;
goto out_unlock; goto out_unlock;
} }