Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242407
b: refs/heads/master
c: e47c085
h: refs/heads/master
i:
  242405: ec01d3f
  242403: 5e5f36b
  242399: 1e192e4
v: v3
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Mar 23, 2011
1 parent f36b68f commit 108d798
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 51e816564db151f7f08c739ad69b9d1dbd166663
refs/heads/master: e47c085afb3d16cbc6a4bfb10a3b074bb7c58998
3 changes: 2 additions & 1 deletion trunk/fs/nfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ int nfs_readdir_search_for_pos(struct nfs_cache_array *array, nfs_readdir_descri
if (diff >= array->size) {
if (array->eof_index >= 0)
goto out_eof;
desc->current_index += array->size;
return -EAGAIN;
}

Expand All @@ -311,6 +310,7 @@ int nfs_readdir_search_for_cookie(struct nfs_cache_array *array, nfs_readdir_des

for (i = 0; i < array->size; i++) {
if (array->array[i].cookie == *desc->dir_cookie) {
desc->file->f_pos = desc->current_index + i;
desc->cache_entry_index = i;
return 0;
}
Expand Down Expand Up @@ -342,6 +342,7 @@ int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)

if (status == -EAGAIN) {
desc->last_cookie = array->last_cookie;
desc->current_index += array->size;
desc->page_index++;
}
nfs_readdir_release_array(desc->page);
Expand Down

0 comments on commit 108d798

Please sign in to comment.