svn commit: r212217 - head/sys/fs/nfsclient

[Rick Macklem]

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;