NFS: Ensure that we update the readdir filp->f_pos correctly

PATCH Superseded Bryan Schumaker 1 participant 1 message Mar 23, 2011

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Bryan Schumaker

author

2011-03-23 17:39 UTC #0 lore raw

PATCH 1/3 NFS: Ensure that we update the readdir filp->f_pos correctly

If we're doing a search by readdir cookie, we need to ensure that the resulting f_pos is updated. To do so, we need to update the desc->current_index, in the same way that we do in the search by file offset case.

Signed-off-by Trond Myklebust <[email protected]>

---
 fs/nfs/dir.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

fs/nfs/dir.c +2 -1

index f685f15..a9824ce 100644
@@ -291,7 +291,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;
 	}

@@ -312,6 +311,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;
 		}

@@ -343,6 +343,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);

-- 1.7.4