From owner-svn-src-projects@FreeBSD.ORG  Fri Mar  9 02:13:47 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9079106566C;
	Fri,  9 Mar 2012 02:13:47 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B87AF8FC17;
	Fri,  9 Mar 2012 02:13:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q292Dlbn074942;
	Fri, 9 Mar 2012 02:13:47 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q292DlI2074940;
	Fri, 9 Mar 2012 02:13:47 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201203090213.q292DlI2074940@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Fri, 9 Mar 2012 02:13:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232713 - projects/nfsv4.1-client/sys/fs/nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 09 Mar 2012 02:13:47 -0000

Author: rmacklem
Date: Fri Mar  9 02:13:47 2012
New Revision: 232713
URL: http://svn.freebsd.org/changeset/base/232713

Log:
  Add checks for callbacks working before either asking for layouts
  or trying to use them. Callbacks are required for pNFS, so the
  server can recall layouts.

Modified:
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Fri Mar  9 01:32:05 2012	(r232712)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Fri Mar  9 02:13:47 2012	(r232713)
@@ -322,7 +322,8 @@ else printf(" fhl=0\n");
 			}
 
 			/* Try and get a Layout, if it is supported. */
-			if (error == 0 && NFSHASPNFS(nmp)) {
+			if (error == 0 && NFSHASPNFS(nmp) &&
+			    nfscl_enablecallb != 0 && nfs_numnfscbd > 0) {
 				stateid.seqid = op->nfso_stateid.seqid;
 				stateid.other[0] = op->nfso_stateid.other[0];
 				stateid.other[1] = op->nfso_stateid.other[1];
@@ -5274,7 +5275,7 @@ nfscl_doiods(vnode_t vp, struct uio *uio
 	int eof, error;
 	void *lckp;
 
-	if (!NFSHASPNFS(nmp))
+	if (!NFSHASPNFS(nmp) || nfscl_enablecallb == 0 || nfs_numnfscbd == 0)
 		return (EIO);
 	/* Now, get a reference cnt on the clientid for this mount. */
 	if (nfscl_getref(nmp) == 0)