From owner-svn-src-projects@FreeBSD.ORG  Fri Jan  3 02:22:45 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BD0B198E;
 Fri,  3 Jan 2014 02:22:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A92761AA9;
 Fri,  3 Jan 2014 02:22:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s032MjMc013930;
 Fri, 3 Jan 2014 02:22:45 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s032MjUa013929;
 Fri, 3 Jan 2014 02:22:45 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201401030222.s032MjUa013929@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Fri, 3 Jan 2014 02:22:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r260216 - projects/nfsv4.1-server/sys/fs/nfsserver
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 02:22:45 -0000

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;