Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e47c085a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 51e81656

fs/nfs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}
@@ -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;

		}
@@ -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);