UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Trond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Tested-by: Benjamin Coddington <bcodding@redhat.com>
Tested-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Trond Myklebust 2020-11-01 17:15:43 -05:00
parent b1e21c9743
commit 972bcdf233
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fs/nfs/dir.c
View File

@ -601,16 +601,12 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en
struct xdr_stream stream; struct xdr_stream stream;
struct xdr_buf buf; struct xdr_buf buf;
struct page *scratch; struct page *scratch;
unsigned int count = 0;
int status; int status;
scratch = alloc_page(GFP_KERNEL); scratch = alloc_page(GFP_KERNEL);
if (scratch == NULL) if (scratch == NULL)
return -ENOMEM; return -ENOMEM;
if (buflen == 0)
goto out_nopages;
xdr_init_decode_pages(&stream, &buf, xdr_pages, buflen); xdr_init_decode_pages(&stream, &buf, xdr_pages, buflen);
xdr_set_scratch_buffer(&stream, page_address(scratch), PAGE_SIZE); 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; entry->label->len = NFS4_MAXLABELLEN;
status = xdr_decode(desc, entry, &stream); status = xdr_decode(desc, entry, &stream);
if (status != 0) { if (status != 0)
if (status == -EAGAIN)
status = 0;
break; break;
}
count++;
if (desc->plus) if (desc->plus)
nfs_prime_dcache(file_dentry(desc->file), entry, nfs_prime_dcache(file_dentry(desc->file), entry,
desc->dir_verifier); desc->dir_verifier);
status = nfs_readdir_add_to_array(entry, page); status = nfs_readdir_add_to_array(entry, page);
if (status != 0) } while (!status && !entry->eof);
break;
} while (!entry->eof);
out_nopages: switch (status) {
if (count == 0 || (status == -EBADCOOKIE && entry->eof != 0)) { case -EBADCOOKIE:
if (entry->eof) {
nfs_readdir_page_set_eof(page); nfs_readdir_page_set_eof(page);
status = 0; status = 0;
} }
break;
case -ENOSPC:
case -EAGAIN:
status = 0;
break;
}
put_page(scratch); put_page(scratch);
return status; return status;
@ -714,14 +710,15 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,
if (status < 0) if (status < 0)
break; break;
pglen = status; pglen = status;
status = nfs_readdir_page_filler(desc, &entry, pages, page, pglen); if (pglen == 0) {
if (status < 0) { nfs_readdir_page_set_eof(page);
if (status == -ENOSPC)
status = 0;
break; 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); nfs_readdir_free_pages(pages, array_size);
out_release_array: out_release_array: