Module Name: src
Committed By: pooka
Date: Tue Jan 4 00:09:43 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Don't try to change the size of non-reg nodes or when vattr doesn't
contain a new size.
from njoly
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.79 src/sys/rump/librump/rumpvfs/rumpfs.c:1.80
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.79 Sat Jan 1 19:47:22 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Tue Jan 4 00:09:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.79 2011/01/01 19:47:22 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.80 2011/01/04 00:09:43 pooka Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.79 2011/01/01 19:47:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.80 2011/01/04 00:09:43 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -776,10 +776,13 @@
struct vattr *a_vap;
kauth_cred_t a_cred;
} */ *ap = v;
- struct rumpfs_node *rn = ap->a_vp->v_data;
+ struct vnode *vp = ap->a_vp;
+ struct vattr *vap = ap->a_vap;
+ struct rumpfs_node *rn = vp->v_data;
- memcpy(&rn->rn_va, ap->a_vap, sizeof(struct vattr));
- uvm_vnp_setsize(ap->a_vp, ap->a_vap->va_size);
+ memcpy(&rn->rn_va, vap, sizeof(rn->rn_va));
+ if (vp->v_type == VREG && vap->va_size != VSIZENOTSET)
+ uvm_vnp_setsize(vp, vap->va_size);
return 0;
}
