svn commit: r212836 - stable/8/sys/fs/nfsclient

[Rick Macklem]

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;