svn commit: r251671 - stable/9/sys/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Wed Jun 12 23:13:42 2013
New Revision: 251671
URL: http://svnweb.freebsd.org/changeset/base/251671

Log:
  MFC: r251089
  Add a patch analygous to r248567, r248581, r251079 to the
  old NFS client to avoid the panic reported in the PR by
  doing the vnode_pager_setsize() call after unlocking the mutex.

Modified:
  stable/9/sys/nfsclient/nfs_subs.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/nfsclient/nfs_subs.c
==============================================================================
--- stable/9/sys/nfsclient/nfs_subs.c	Wed Jun 12 22:19:49 2013	(r251670)
+++ stable/9/sys/nfsclient/nfs_subs.c	Wed Jun 12 23:13:42 2013	(r251671)
@@ -478,6 +478,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 	struct timespec mtime, mtime_save;
 	int v3 = NFS_ISV3(vp);
 	int error = 0;
+	u_quad_t nsize;
+	int setnsize;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
@@ -580,6 +582,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 		vap->va_filerev = 0;
 	}
 	np->n_attrstamp = time_second;
+	setnsize = 0;
+	nsize = 0;
 	if (vap->va_size != np->n_size) {
 		if (vap->va_type == VREG) {
 			if (dontshrink && vap->va_size < np->n_size) {
@@ -606,7 +610,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 				np->n_size = vap->va_size;
 				np->n_flag |= NSIZECHANGED;
 			}
-			vnode_pager_setsize(vp, np->n_size);
+			setnsize = 1;
+			nsize = vap->va_size;
 		} else {
 			np->n_size = vap->va_size;
 		}
@@ -643,6 +648,8 @@ nfs_loadattrcache(struct vnode **vpp, st
 		KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, &np->n_vattr, 0);
 #endif
 	mtx_unlock(&np->n_mtx);
+	if (setnsize)
+		vnode_pager_setsize(vp, nsize);
 out:
 #ifdef KDTRACE_HOOKS
 	if (error)