diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-12-07 18:41:58 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-12-07 18:41:58 +0100 |
| commit | 18fb5fe40ce7f789b5cfc3aa81ff1e6175b0a5be (patch) | |
| tree | e7d191c921142ecb1cb2eba0634cb0c6ba89459d /fs | |
| parent | NFS: Fix a memory leak in nfs_readdir (diff) | |
| download | linux-18fb5fe40ce7f789b5cfc3aa81ff1e6175b0a5be.tar.xz linux-18fb5fe40ce7f789b5cfc3aa81ff1e6175b0a5be.zip | |
NFS: nfs_readdir_search_for_cookie() don't mark as eof if cookie not found
If we're searching for a specific cookie, and it isn't found in the page
cache, we should try an uncached_readdir(). To do so, we return EBADCOOKIE,
but we don't set desc->eof.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index d529e0e99efa..ad2fde23446d 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -316,8 +316,9 @@ int nfs_readdir_search_for_cookie(struct nfs_cache_array *array, nfs_readdir_des } } if (i == array->eof_index) { - desc->eof = 1; status = -EBADCOOKIE; + if (*desc->dir_cookie == array->last_cookie) + desc->eof = 1; } out: return status; |