svn commit: r249078 - stable/9/sys/fs/nfsclient

[Konstantin Belousov]

Author: kib
Date: Thu Apr  4 05:26:22 2013
New Revision: 249078
URL: http://svnweb.freebsd.org/changeset/base/249078

Log:
  MFC r248567:
  Do not call vnode_pager_setsize() while a NFS node mutex is
  locked. vnode_pager_setsize() might sleep waiting for the page after
  EOF be unbusied.
  
  Call vnode_pager_setsize() both for the regular and directory vnodes.
  
  MFC r248581:
  Initialize the variable to avoid (false) compiler warning about
  use of an uninitialized local.

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

Modified: stable/9/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clport.c	Thu Apr  4 05:20:52 2013	(r249077)
+++ stable/9/sys/fs/nfsclient/nfs_clport.c	Thu Apr  4 05:26:22 2013	(r249078)
@@ -367,6 +367,8 @@ nfscl_loadattrcache(struct vnode **vpp, 
 	struct nfsnode *np;
 	struct nfsmount *nmp;
 	struct timespec mtime_save;
+	u_quad_t nsize;
+	int setnsize;
 
 	/*
 	 * If v_type == VNON it is a new node, so fill in the v_type,
@@ -424,6 +426,8 @@ nfscl_loadattrcache(struct vnode **vpp, 
 	} else
 		vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[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) {
@@ -450,10 +454,13 @@ nfscl_loadattrcache(struct vnode **vpp, 
 				np->n_size = vap->va_size;
 				np->n_flag |= NSIZECHANGED;
 			}
-			vnode_pager_setsize(vp, np->n_size);
 		} else {
 			np->n_size = vap->va_size;
 		}
+		if (vap->va_type == VREG || vap->va_type == VDIR) {
+			setnsize = 1;
+			nsize = vap->va_size;
+		}
 	}
 	/*
 	 * The following checks are added to prevent a race between (say)
@@ -486,6 +493,8 @@ nfscl_loadattrcache(struct vnode **vpp, 
 		KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, vap, 0);
 #endif
 	NFSUNLOCKNODE(np);
+	if (setnsize)
+		vnode_pager_setsize(vp, nsize);
 	return (0);
 }