Skip to content

Commit fb7622c

Browse files
committed
NFSD: De-duplicate net_generic(SVC_NET(rqstp), nfsd_net_id)
Since this pointer is used repeatedly, move it to a stack variable. Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 33388b3 commit fb7622c

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

fs/nfsd/vfs.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
954954
unsigned long *cnt, int stable,
955955
__be32 *verf)
956956
{
957+
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
957958
struct file *file = nf->nf_file;
958959
struct super_block *sb = file_inode(file)->i_sb;
959960
struct svc_export *exp;
@@ -998,13 +999,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
998999
iov_iter_kvec(&iter, WRITE, vec, vlen, *cnt);
9991000
since = READ_ONCE(file->f_wb_err);
10001001
if (verf)
1001-
nfsd_copy_boot_verifier(verf,
1002-
net_generic(SVC_NET(rqstp),
1003-
nfsd_net_id));
1002+
nfsd_copy_boot_verifier(verf, nn);
10041003
host_err = vfs_iter_write(file, &iter, &pos, flags);
10051004
if (host_err < 0) {
1006-
nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
1007-
nfsd_net_id));
1005+
nfsd_reset_boot_verifier(nn);
10081006
goto out_nfserr;
10091007
}
10101008
*cnt = host_err;
@@ -1017,8 +1015,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
10171015
if (stable && use_wgather) {
10181016
host_err = wait_for_concurrent_writes(file);
10191017
if (host_err < 0)
1020-
nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
1021-
nfsd_net_id));
1018+
nfsd_reset_boot_verifier(nn);
10221019
}
10231020

10241021
out_nfserr:

0 commit comments

Comments
 (0)