Sat Sep 7 16:08:28 2013 UTC ()

Pull up following revision(s) (requested by hannken in ticket #933):
	sys/nfs/nfs_bio.c: revision 1.189
Function nfs_vinvalbuf() ignores errors from vinvalbuf() and therefore
delayed write errors may get lost.
Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or =
close().
=20
Presented on tech-kern@
=20
Fix for PR kern/47980 (NFS over-quota not detected if utimes() called
before fsync()/close())
=20
=20


(bouyer)

diff -r1.188 -r1.188.22.1 src/sys/nfs/nfs_bio.c

--- src/sys/nfs/nfs_bio.c 2011/09/27 01:07:38	1.188
+++ src/sys/nfs/nfs_bio.c 2013/09/07 16:08:28	1.188.22.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $	*/
+/*	$NetBSD: nfs_bio.c,v 1.188.22.1 2013/09/07 16:08:28 bouyer Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.188.22.1 2013/09/07 16:08:28 bouyer Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
 #include "opt_ddb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 @@ -604,27 +604,27 @@ nfs_getcacheblk(struct vnode *vp, daddr_
 	return (bp);
+}
 /*
  * Flush and invalidate all dirty buffers. If another process is already
  * doing the flush, just wait for completion.
  */
 int
 nfs_vinvalbuf(struct vnode *vp, int flags, kauth_cred_t cred,
 		struct lwp *l, int intrflg)
+{
 	struct nfsnode *np = VTONFS(vp);
 	struct nfsmount *nmp = VFSTONFS(vp->v_mount);
-	int error = 0, slptimeo;
+	int error = 0, allerror = 0, slptimeo;
 	bool catch;
 	if ((nmp->nm_flag & NFSMNT_INT) == 0)
 		intrflg = 0;
 	if (intrflg) {
 		catch = true;
 		slptimeo = 2 * hz;
 	} else {
 		catch = false;
 		slptimeo = 0;
+	}
 	/*
 	 * First wait for any other process doing a flush to complete.
 @@ -637,33 +637,42 @@ nfs_vinvalbuf(struct vnode *vp, int flag
 		if (error && intrflg && nfs_sigintr(nmp, NULL, l)) {
 			mutex_exit(vp->v_interlock);
 			return EINTR;
+		}
+	}
 	/*
 	 * Now, flush as required.
 	 */
 	np->n_flag |= NFLUSHINPROG;
 	mutex_exit(vp->v_interlock);
 	error = vinvalbuf(vp, flags, cred, l, catch, 0);
 	while (error) {
 		if (allerror == 0)
 			allerror = error;
 		if (intrflg && nfs_sigintr(nmp, NULL, l)) {
 			error = EINTR;
 			break;
+		}
 		error = vinvalbuf(vp, flags, cred, l, 0, slptimeo);
+	}
 	mutex_enter(vp->v_interlock);
 	if (allerror != 0) {
 		/*
 		 * Keep error from vinvalbuf so fsync/close will know.
 		 */
 		np->n_error = allerror;
 		np->n_flag |= NWRITEERR;
+	}
 	if (error == 0)
 		np->n_flag &= ~NMODIFIED;
 	np->n_flag &= ~NFLUSHINPROG;
 	if (np->n_flag & NFLUSHWANT) {
 		np->n_flag &= ~NFLUSHWANT;
 		wakeup(&np->n_flag);
+	}
 	mutex_exit(vp->v_interlock);
 	return error;
+}
 /*
  * nfs_flushstalebuf: flush cache if it's stale.