NFSD: Skip extra computation for RC_NOCACHE case

[ Upstream commit 0f29ce32fbc56cfdb304eec8a4deb920ccfd89c3 ]

Force the compiler to skip unneeded initialization for cases that
don't need those values. For example, NFSv4 COMPOUND operations are
RC_NOCACHE.

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-09-28 11:39:02 -04:00 committed by Ksawlii
parent cfdba1e2d8
commit 8517132f6f

View file

@ -421,10 +421,10 @@ out:
*/ */
int nfsd_cache_lookup(struct svc_rqst *rqstp) int nfsd_cache_lookup(struct svc_rqst *rqstp)
{ {
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); struct nfsd_net *nn;
struct svc_cacherep *rp, *found; struct svc_cacherep *rp, *found;
__wsum csum; __wsum csum;
struct nfsd_drc_bucket *b = nfsd_cache_bucket_find(rqstp->rq_xid, nn); struct nfsd_drc_bucket *b;
int type = rqstp->rq_cachetype; int type = rqstp->rq_cachetype;
int rtn = RC_DOIT; int rtn = RC_DOIT;
@ -440,10 +440,12 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp)
* Since the common case is a cache miss followed by an insert, * Since the common case is a cache miss followed by an insert,
* preallocate an entry. * preallocate an entry.
*/ */
nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
rp = nfsd_reply_cache_alloc(rqstp, csum, nn); rp = nfsd_reply_cache_alloc(rqstp, csum, nn);
if (!rp) if (!rp)
goto out; goto out;
b = nfsd_cache_bucket_find(rqstp->rq_xid, nn);
spin_lock(&b->cache_lock); spin_lock(&b->cache_lock);
found = nfsd_cache_insert(b, rp, nn); found = nfsd_cache_insert(b, rp, nn);
if (found != rp) { if (found != rp) {