Commit 972bcdf2 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up nfs_readdir_page_filler() 



Clean up handling of the case where there are no entries in the readdir
reply.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Tested-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Tested-by: default avatarDave Wysochanski <dwysocha@redhat.com>
parent b1e21c97

fs/nfs/dir.c

+18 −21
Original line number Diff line number Diff line
@@ -601,16 +601,12 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en 
	struct xdr_stream stream;

	struct xdr_buf buf;

	struct page *scratch;

	unsigned int count = 0;

	int status;



	scratch = alloc_page(GFP_KERNEL);

	if (scratch == NULL)

		return -ENOMEM;



	if (buflen == 0)

		goto out_nopages;



	xdr_init_decode_pages(&stream, &buf, xdr_pages, buflen);

	xdr_set_scratch_buffer(&stream, page_address(scratch), PAGE_SIZE);
@@ -619,28 +615,28 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en 
			entry->label->len = NFS4_MAXLABELLEN;



		status = xdr_decode(desc, entry, &stream);

		if (status != 0) {

			if (status == -EAGAIN)

				status = 0;

		if (status != 0)

			break;

		}



		count++;



		if (desc->plus)

			nfs_prime_dcache(file_dentry(desc->file), entry,

					desc->dir_verifier);



		status = nfs_readdir_add_to_array(entry, page);

		if (status != 0)

			break;

	} while (!entry->eof);

	} while (!status && !entry->eof);



out_nopages:

	if (count == 0 || (status == -EBADCOOKIE && entry->eof != 0)) {

	switch (status) {

	case -EBADCOOKIE:

		if (entry->eof) {

			nfs_readdir_page_set_eof(page);

			status = 0;

		}

		break;

	case -ENOSPC:

	case -EAGAIN:

		status = 0;

		break;

	}



	put_page(scratch);

	return status;
@@ -714,14 +710,15 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, 


		if (status < 0)

			break;



		pglen = status;

		status = nfs_readdir_page_filler(desc, &entry, pages, page, pglen);

		if (status < 0) {

			if (status == -ENOSPC)

				status = 0;

		if (pglen == 0) {

			nfs_readdir_page_set_eof(page);

			break;

		}

	} while (!nfs_readdir_array_is_full(array));



		status = nfs_readdir_page_filler(desc, &entry, pages, page, pglen);

	} while (!status && !nfs_readdir_array_is_full(array));



	nfs_readdir_free_pages(pages, array_size);

out_release_array: