Commit e47a62df authored by Trond Myklebust's avatar Trond Myklebust

NFS: Fix revalidation of empty readdir pages

If the page is empty, we need to check the array->last_cookie instead of
the first entry. Add a helper for the cases where we care.
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 648a4548
...@@ -252,6 +252,11 @@ static void nfs_readdir_page_array_free(struct page *page) ...@@ -252,6 +252,11 @@ static void nfs_readdir_page_array_free(struct page *page)
} }
} }
static u64 nfs_readdir_array_index_cookie(struct nfs_cache_array *array)
{
return array->size == 0 ? array->last_cookie : array->array[0].cookie;
}
static void nfs_readdir_array_set_eof(struct nfs_cache_array *array) static void nfs_readdir_array_set_eof(struct nfs_cache_array *array)
{ {
array->page_is_eof = 1; array->page_is_eof = 1;
...@@ -369,7 +374,7 @@ static bool nfs_readdir_page_validate(struct page *page, u64 last_cookie, ...@@ -369,7 +374,7 @@ static bool nfs_readdir_page_validate(struct page *page, u64 last_cookie,
if (array->change_attr != change_attr) if (array->change_attr != change_attr)
ret = false; ret = false;
if (array->size > 0 && array->array[0].cookie != last_cookie) if (nfs_readdir_array_index_cookie(array) != last_cookie)
ret = false; ret = false;
kunmap_atomic(array); kunmap_atomic(array);
return ret; return ret;
...@@ -480,7 +485,7 @@ static void nfs_readdir_seek_next_array(struct nfs_cache_array *array, ...@@ -480,7 +485,7 @@ static void nfs_readdir_seek_next_array(struct nfs_cache_array *array,
desc->cache_entry_index = 0; desc->cache_entry_index = 0;
desc->page_index++; desc->page_index++;
} else } else
desc->last_cookie = array->array[0].cookie; desc->last_cookie = nfs_readdir_array_index_cookie(array);
} }
static void nfs_readdir_rewind_search(struct nfs_readdir_descriptor *desc) static void nfs_readdir_rewind_search(struct nfs_readdir_descriptor *desc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment