From owner-svn-src-all@FreeBSD.ORG  Sun Sep 19 02:07:30 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 D3D411065670;
	Sun, 19 Sep 2010 02:07:30 +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 C2BEE8FC0C;
	Sun, 19 Sep 2010 02:07:30 +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 o8J27UUA085455;
	Sun, 19 Sep 2010 02:07:30 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8J27Uix085453;
	Sun, 19 Sep 2010 02:07:30 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201009190207.o8J27Uix085453@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 19 Sep 2010 02:07:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212836 - stable/8/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, 19 Sep 2010 02:07:31 -0000

Author: rmacklem
Date: Sun Sep 19 02:07:30 2010
New Revision: 212836
URL: http://svn.freebsd.org/changeset/base/212836

Log:
  MFC: r212217
  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.

Modified:
  stable/8/sys/fs/nfsclient/nfs_clbio.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clbio.c	Sun Sep 19 01:41:49 2010	(r212835)
+++ stable/8/sys/fs/nfsclient/nfs_clbio.c	Sun Sep 19 02:07:30 2010	(r212836)
@@ -506,10 +506,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;