svn commit: r340852 - stable/11/sys/fs/nfsserver

[Ed Maste]

Author: emaste
Date: Fri Nov 23 20:38:50 2018
New Revision: 340852
URL: https://svnweb.freebsd.org/changeset/base/340852

Log:
  MFC r340661 (rmacklem):
  
  r304026 added code that started statistics gathering for an operation
  before the operation number (the variable called "op") was sanity checked.
  This patch moves the code down to below the range sanity check for "op".

Modified:
  stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c
==============================================================================
--- stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c	Fri Nov 23 20:32:41 2018	(r340851)
+++ stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c	Fri Nov 23 20:38:50 2018	(r340852)
@@ -758,11 +758,6 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram
 		*repp = *tl;
 		op = fxdr_unsigned(int, *tl);
 		NFSD_DEBUG(4, "op=%d\n", op);
-
-		binuptime(&start_time);
-		nfsrvd_statstart(op, &start_time);
-		statsinprog = 1;
-
 		if (op < NFSV4OP_ACCESS ||
 		    (op >= NFSV4OP_NOPS && (nd->nd_flag & ND_NFSV41) == 0) ||
 		    (op >= NFSV41_NOPS && (nd->nd_flag & ND_NFSV41) != 0)) {
@@ -774,6 +769,11 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram
 		} else {
 			repp++;
 		}
+
+		binuptime(&start_time);
+		nfsrvd_statstart(op, &start_time);
+		statsinprog = 1;
+
 		if (i == 0)
 			op0 = op;
 		if (i == numops - 1)