Module Name: src
Committed By: pooka
Date: Mon Aug 5 11:14:00 UTC 2013
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Only free file data we've allocated.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 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.118 src/sys/rump/librump/rumpvfs/rumpfs.c:1.119
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.118 Sun Aug 4 11:09:55 2013
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Aug 5 11:14:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.118 2013/08/04 11:09:55 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.119 2013/08/05 11:14:00 pooka Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.118 2013/08/04 11:09:55 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.119 2013/08/05 11:14:00 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1664,7 +1664,9 @@ rump_vop_reclaim(void *v)
vp->v_data = NULL;
if (rn->rn_flags & RUMPNODE_CANRECLAIM) {
- if (vp->v_type == VREG && rn->rn_data) {
+ if (vp->v_type == VREG
+ && (rn->rn_flags & RUMPNODE_ET_PHONE_HOST) == 0
+ && rn->rn_data) {
rump_hyperfree(rn->rn_data, rn->rn_dlen);
rn->rn_data = NULL;
}
