xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: De-duplicate net_generic(SVC_NET(rqstp), nfsd_net_id)

Browse Source 
[ Upstream commit fb7622c2dbd1aa41133a8c73e1137b833c074519 ]

Since this pointer is used repeatedly, move it to a stack variable.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever
2021-12-28 12:41:32 -05:00
committed by Greg Kroah-Hartman
parent aa9ea9ec29
commit 5a1575c02b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfsd/vfs.c
View File

@@ -980,6 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
unsigned long *cnt, int stable, unsigned long *cnt, int stable,
__be32 *verf) __be32 *verf)
{ {
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
struct file *file = nf->nf_file; struct file *file = nf->nf_file;
struct super_block *sb = file_inode(file)->i_sb; struct super_block *sb = file_inode(file)->i_sb;
struct svc_export *exp; struct svc_export *exp;
@@ -1024,13 +1025,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
iov_iter_kvec(&iter, WRITE, vec, vlen, *cnt); iov_iter_kvec(&iter, WRITE, vec, vlen, *cnt);
since = READ_ONCE(file->f_wb_err); since = READ_ONCE(file->f_wb_err);
if (verf) if (verf)
nfsd_copy_boot_verifier(verf, nfsd_copy_boot_verifier(verf, nn);
net_generic(SVC_NET(rqstp),
nfsd_net_id));
host_err = vfs_iter_write(file, &iter, &pos, flags); host_err = vfs_iter_write(file, &iter, &pos, flags);
if (host_err < 0) { if (host_err < 0) {
nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp), nfsd_reset_boot_verifier(nn);
nfsd_net_id));
goto out_nfserr; goto out_nfserr;
} }
*cnt = host_err; *cnt = host_err;
@@ -1043,8 +1041,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
if (stable && use_wgather) { if (stable && use_wgather) {
host_err = wait_for_concurrent_writes(file); host_err = wait_for_concurrent_writes(file);
if (host_err < 0) if (host_err < 0)
nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp), nfsd_reset_boot_verifier(nn);
nfsd_net_id));
} }
out_nfserr: out_nfserr: