From owner-svn-src-stable-9@FreeBSD.ORG  Tue Jun  4 22:29:20 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3E371B64;
 Tue,  4 Jun 2013 22:29:20 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2FE7E1F97;
 Tue,  4 Jun 2013 22:29:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54MTKmo001826;
 Tue, 4 Jun 2013 22:29:20 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54MTKSK001825;
 Tue, 4 Jun 2013 22:29:20 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201306042229.r54MTKSK001825@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 4 Jun 2013 22:29:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251395 - stable/9/sys/fs/nfsclient
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jun 2013 22:29:20 -0000

Author: rmacklem
Date: Tue Jun  4 22:29:19 2013
New Revision: 251395
URL: http://svnweb.freebsd.org/changeset/base/251395

Log:
  MFC: r251079
  Post-r248567, there were times when the client would return a
  truncated directory for some NFS servers. This turned out to
  be because the size of a directory reported by an NFS server
  can be smaller that the ufs-like directory created from the
  RPC XDR in the client. This patch fixes the problem by changing
  r248567 so that vnode_pager_setsize() is only done for regular files.

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	Tue Jun  4 20:49:17 2013	(r251394)
+++ stable/9/sys/fs/nfsclient/nfs_clport.c	Tue Jun  4 22:29:19 2013	(r251395)
@@ -454,12 +454,10 @@ nfscl_loadattrcache(struct vnode **vpp, 
 				np->n_size = vap->va_size;
 				np->n_flag |= NSIZECHANGED;
 			}
-		} else {
-			np->n_size = vap->va_size;
-		}
-		if (vap->va_type == VREG || vap->va_type == VDIR) {
 			setnsize = 1;
 			nsize = vap->va_size;
+		} else {
+			np->n_size = vap->va_size;
 		}
 	}
 	/*