Commit 39bd1bfe authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: use per-operation statidx for callback procedures 



The callback RPC procedure table uses NFSPROC4_CB_##call for
p_statidx, which maps CB_NULL to index 0 and every
compound-based callback (CB_RECALL, CB_LAYOUT, CB_OFFLOAD,
etc.) to index 1. All compound callback operations therefore
share a single statistics counter, making per-operation
accounting impossible.

Assign p_statidx from the NFSPROC4_CLNT_##proc enum instead,
giving each callback operation its own counter slot. The
counts array is already sized by ARRAY_SIZE(nfs4_cb_procedures),
so no allocation change is needed.

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 18755b8c

fs/nfsd/nfs4callback.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static int nfs4_xdr_dec_cb_offload(struct rpc_rqst *rqstp, 
	.p_decode  = nfs4_xdr_dec_##restype,				\

	.p_arglen  = NFS4_enc_##argtype##_sz,				\

	.p_replen  = NFS4_dec_##restype##_sz,				\

	.p_statidx = NFSPROC4_CB_##call,				\

	.p_statidx = NFSPROC4_CLNT_##proc,				\

	.p_name    = #proc,						\

}