From owner-p4-projects@FreeBSD.ORG  Sun Jun 26 09:48:02 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA44D1065670; Sun, 26 Jun 2011 09:48:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F92E106564A
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:48:01 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 63F798FC12
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:48:01 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5Q9m1fK010823
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:48:01 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5Q9m1xc010820
	for perforce@freebsd.org; Sun, 26 Jun 2011 09:48:01 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Sun, 26 Jun 2011 09:48:01 GMT
Message-Id: <201106260948.p5Q9m1xc010820@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau <ilya@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 195348 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2011 09:48:02 -0000

http://p4web.freebsd.org/@@195348?ac=10

Change 195348 by ilya@ilya_triton2011 on 2011/06/26 09:47:02

	Resync size in vnop_getattr(). Invalidate attr cache after resize in
	vnop_setattr().  Remove unused node->newfilesize.
	
	Merge http://macfuse.googlecode.com/svn/trunk@89
	Merge http://macfuse.googlecode.com/svn/trunk@149
	Partially merge http://macfuse.googlecode.com/svn/trunk@147

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#8 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#21 edit

Differences ...

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#8 (text+ko) ====

@@ -42,7 +42,6 @@
     struct sx  truncatelock;
 
     off_t      filesize; 
-    off_t      newfilesize;
 
     struct     fuse_filehandle fufh[3];
 

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#21 (text+ko) ====

@@ -474,6 +474,20 @@
         memcpy(vap, VTOVA(vp), sizeof(*vap));
     }
 
+    if (vnode_isreg(vp)) {
+        /*
+         * This is for those cases when the file size changed without us
+         * knowing, and we want to catch up.
+         */
+        struct fuse_vnode_data *fvdat = VTOFUD(vp);
+        off_t new_filesize = ((struct fuse_attr_out *)fdi.answ)->attr.size;
+
+        if (fvdat->filesize != new_filesize) {
+            fvdat->filesize = new_filesize;
+            vnode_pager_setsize(vp, new_filesize);
+        }
+    }
+
     fuse_ticket_drop(fdi.tick);
 
     if (vnode_vtype(vp) != vap->va_type) {
@@ -1681,13 +1695,15 @@
         }
     }
 
-    cache_attrs(vp, (struct fuse_attr_out *)fdi.answ);
+    if (!err && !sizechanged) {
+        cache_attrs(vp, (struct fuse_attr_out *)fdi.answ);
+    }
 
 out:
     fuse_ticket_drop(fdi.tick);
     if (!err && sizechanged) {
+        fuse_invalidate_attr(vp);
         VTOFUD(vp)->filesize = newsize;
-        VTOFUD(vp)->newfilesize = newsize;
         vnode_pager_setsize(vp, newsize);
     }