Module Name: src
Committed By: pooka
Date: Wed Feb 2 14:41:56 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
adjust inode size too if VOP_SETATTR changes size
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 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.89 src/sys/rump/librump/rumpvfs/rumpfs.c:1.90
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.89 Fri Jan 14 11:07:42 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Feb 2 14:41:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.89 2011/01/14 11:07:42 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.90 2011/02/02 14:41:55 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.89 2011/01/14 11:07:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.90 2011/02/02 14:41:55 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -855,8 +855,24 @@
SETIFVAL(va_flags, u_long);
#undef SETIFVAL
- if (vp->v_type == VREG && vap->va_size != VSIZENOTSET)
- uvm_vnp_setsize(vp, vap->va_size);
+ if (vp->v_type == VREG &&
+ vap->va_size != VSIZENOTSET &&
+ vap->va_size != rn->rn_dlen) {
+ void *newdata;
+ size_t copylen, newlen;
+
+ newlen = vap->va_size;
+ newdata = rump_hypermalloc(newlen, 0, true, "rumpfs");
+
+ copylen = MIN(rn->rn_dlen, newlen);
+ memset(newdata, 0, newlen);
+ memcpy(newdata, rn->rn_data, copylen);
+ rump_hyperfree(rn->rn_data, rn->rn_dlen);
+
+ rn->rn_data = newdata;
+ rn->rn_dlen = newlen;
+ uvm_vnp_setsize(vp, newlen);
+ }
return 0;
}
