UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler 

We need to use the cookie from the previous array entry, not the
actual cookie that we are searching for (except for the case of
uncached_readdir).

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2010-11-30 21:56:32 -05:00
parent 22a5b566c8
commit 0aded708d1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfs/dir.c
View File

@ -178,6 +178,7 @@ typedef struct {
struct page *page; struct page *page;
unsigned long page_index; unsigned long page_index;
u64 *dir_cookie; u64 *dir_cookie;
u64 last_cookie;
loff_t current_index; loff_t current_index;
decode_dirent_t decode; decode_dirent_t decode;
@ -344,6 +345,8 @@ int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)
else else
status = nfs_readdir_search_for_cookie(array, desc); status = nfs_readdir_search_for_cookie(array, desc);
if (status == -EAGAIN)
desc->last_cookie = array->last_cookie;
nfs_readdir_release_array(desc->page); nfs_readdir_release_array(desc->page);
out: out:
return status; return status;
@ -563,7 +566,7 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,
unsigned int array_size = ARRAY_SIZE(pages); unsigned int array_size = ARRAY_SIZE(pages);
entry.prev_cookie = 0; entry.prev_cookie = 0;
entry.cookie = *desc->dir_cookie; entry.cookie = desc->last_cookie;
entry.eof = 0; entry.eof = 0;
entry.fh = nfs_alloc_fhandle(); entry.fh = nfs_alloc_fhandle();
entry.fattr = nfs_alloc_fattr(); entry.fattr = nfs_alloc_fattr();
@ -672,8 +675,10 @@ int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
{ {
int res; int res;
if (desc->page_index == 0) if (desc->page_index == 0) {
desc->current_index = 0; desc->current_index = 0;
desc->last_cookie = 0;
}
while (1) { while (1) {
res = find_cache_page(desc); res = find_cache_page(desc);
if (res != -EAGAIN) if (res != -EAGAIN)
@ -764,6 +769,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
} }
desc->page_index = 0; desc->page_index = 0;
desc->last_cookie = *desc->dir_cookie;
desc->page = page; desc->page = page;
status = nfs_readdir_xdr_to_array(desc, page, inode); status = nfs_readdir_xdr_to_array(desc, page, inode);