android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Cache all entries in the readdirplus reply

Browse Source 
Even if we're not able to cache all the entries in the readdir buffer,
let's ensure that we do prime the dcache.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2022-02-24 11:48:35 -05:00
parent 0adf85b445
commit 612896ec5a
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fs/nfs/dir.c
View File

@ -789,6 +789,21 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry,
dput(dentry); dput(dentry);
} }
static int nfs_readdir_entry_decode(struct nfs_readdir_descriptor *desc,
struct nfs_entry *entry,
struct xdr_stream *stream)
{
int ret;
if (entry->fattr->label)
entry->fattr->label->len = NFS4_MAXLABELLEN;
ret = xdr_decode(desc, entry, stream);
if (ret || !desc->plus)
return ret;
nfs_prime_dcache(file_dentry(desc->file), entry, desc->dir_verifier);
return 0;
}
/* Perform conversion from xdr to cache array */ /* Perform conversion from xdr to cache array */
static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc, static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc,
struct nfs_entry *entry, struct nfs_entry *entry,
@ -811,17 +826,10 @@ static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc,
xdr_set_scratch_page(&stream, scratch); xdr_set_scratch_page(&stream, scratch);
do { do {
if (entry->fattr->label) status = nfs_readdir_entry_decode(desc, entry, &stream);
entry->fattr->label->len = NFS4_MAXLABELLEN;
status = xdr_decode(desc, entry, &stream);
if (status != 0) if (status != 0)
break; break;
if (desc->plus)
nfs_prime_dcache(file_dentry(desc->file), entry,
desc->dir_verifier);
status = nfs_readdir_page_array_append(page, entry, &cookie); status = nfs_readdir_page_array_append(page, entry, &cookie);
if (status != -ENOSPC) if (status != -ENOSPC)
continue; continue;
@ -849,15 +857,19 @@ static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc,
switch (status) { switch (status) {
case -EBADCOOKIE: case -EBADCOOKIE:
if (entry->eof) { if (!entry->eof)
nfs_readdir_page_set_eof(page); break;
status = 0; nfs_readdir_page_set_eof(page);
} fallthrough;
break;
case -ENOSPC:
case -EAGAIN: case -EAGAIN:
status = 0; status = 0;
break; break;
case -ENOSPC:
status = 0;
if (!desc->plus)
break;
while (!nfs_readdir_entry_decode(desc, entry, &stream))
;
} }
if (page != *arrays) if (page != *arrays)