svn commit: r260216 - projects/nfsv4.1-server/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Fri Jan  3 02:22:45 2014
New Revision: 260216
URL: http://svnweb.freebsd.org/changeset/base/260216

Log:
  Fix the callbacks for NFSv4.0, which were broken by
  a recent change for the NFSv4.1 backchannel callbacks.

Modified:
  projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Jan  3 00:51:02 2014	(r260215)
+++ projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Jan  3 02:22:45 2014	(r260216)
@@ -3993,10 +3993,12 @@ nfsrv_docallback(struct nfsclient *clp, 
 		(void)nfsm_fhtom(nd, (u_int8_t *)fhp, NFSX_MYFH, 0);
 	} else if (procnum == NFSV4PROC_CBNULL) {
 		nd->nd_procnum = NFSV4PROC_CBNULL;
-		error = nfsv4_getcbsession(clp, &sep);
-		if (error != 0) {
-			mbuf_freem(nd->nd_mreq);
-			goto errout;
+		if ((clp->lc_flags & LCL_NFSV41) != 0) {
+			error = nfsv4_getcbsession(clp, &sep);
+			if (error != 0) {
+				mbuf_freem(nd->nd_mreq);
+				goto errout;
+			}
 		}
 	} else {
 		error = NFSERR_SERVERFAULT;