From owner-svn-src-all@FreeBSD.ORG  Sun Sep  5 00:47:44 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A06510656B2;
	Sun,  5 Sep 2010 00:47:44 +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 4947A8FC12;
	Sun,  5 Sep 2010 00:47:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o850lilm046531;
	Sun, 5 Sep 2010 00:47:44 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o850lioc046529;
	Sun, 5 Sep 2010 00:47:44 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201009050047.o850lioc046529@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 5 Sep 2010 00:47:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212217 - head/sys/fs/nfsclient
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Sep 2010 00:47:44 -0000

Author: rmacklem
Date: Sun Sep  5 00:47:44 2010
New Revision: 212217
URL: http://svn.freebsd.org/changeset/base/212217

Log:
  Change the code in ncl_bioread() in the experimental NFS
  client to return an error when rabp is not set, so it
  behaves the same way as the regular NFS client for this
  case. It does not affect NFSv4, since nfs_getcacheblk()
  only fails for "intr" mounts and NFSv4 can't use the
  "intr" mount option.
  
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clbio.c

Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c	Sun Sep  5 00:10:18 2010	(r212216)
+++ head/sys/fs/nfsclient/nfs_clbio.c	Sun Sep  5 00:47:44 2010	(r212217)
@@ -510,10 +510,7 @@ ncl_bioread(struct vnode *vp, struct uio
 			    rabp = nfs_getcacheblk(vp, rabn, biosize, td);
 			    if (!rabp) {
 				error = newnfs_sigintr(nmp, td);
-				if (error)
-				    return (error);
-				else
-				    break;
+				return (error ? error : EINTR);
 			    }
 			    if ((rabp->b_flags & (B_CACHE|B_DELWRI)) == 0) {
 				rabp->b_flags |= B_ASYNC;