Skip to content

Commit 2c445a0

Browse files
committed
NFSD: De-duplicate net_generic(nf->nf_net, 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 fb7622c commit 2c445a0

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

fs/nfsd/vfs.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,7 @@ __be32
11031103
nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
11041104
loff_t offset, unsigned long count, __be32 *verf)
11051105
{
1106+
struct nfsd_net *nn;
11061107
struct nfsd_file *nf;
11071108
loff_t end = LLONG_MAX;
11081109
__be32 err = nfserr_inval;
@@ -1119,29 +1120,27 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
11191120
NFSD_MAY_WRITE|NFSD_MAY_NOT_BREAK_LEASE, &nf);
11201121
if (err)
11211122
goto out;
1123+
nn = net_generic(nf->nf_net, nfsd_net_id);
11221124
if (EX_ISSYNC(fhp->fh_export)) {
11231125
errseq_t since = READ_ONCE(nf->nf_file->f_wb_err);
11241126
int err2;
11251127

11261128
err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
11271129
switch (err2) {
11281130
case 0:
1129-
nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
1130-
nfsd_net_id));
1131+
nfsd_copy_boot_verifier(verf, nn);
11311132
err2 = filemap_check_wb_err(nf->nf_file->f_mapping,
11321133
since);
11331134
break;
11341135
case -EINVAL:
11351136
err = nfserr_notsupp;
11361137
break;
11371138
default:
1138-
nfsd_reset_boot_verifier(net_generic(nf->nf_net,
1139-
nfsd_net_id));
1139+
nfsd_reset_boot_verifier(nn);
11401140
}
11411141
err = nfserrno(err2);
11421142
} else
1143-
nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
1144-
nfsd_net_id));
1143+
nfsd_copy_boot_verifier(verf, nn);
11451144

11461145
nfsd_file_put(nf);
11471146
out:

0 commit comments

Comments
 (0)