Module Name: src
Committed By: hannken
Date: Sat Jan 3 16:30:32 UTC 2015
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Always use (struct rumpfs_node **) as key to vcache operations.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 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.131 src/sys/rump/librump/rumpvfs/rumpfs.c:1.132
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.131 Thu Jan 1 16:02:50 2015
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Sat Jan 3 16:30:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.131 2015/01/01 16:02:50 hannken Exp $ */
+/* $NetBSD: rumpfs.c,v 1.132 2015/01/03 16:30:32 hannken 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.131 2015/01/01 16:02:50 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.132 2015/01/03 16:30:32 hannken Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -486,7 +486,7 @@ etfsremove(const char *key)
mp = NULL;
}
mutex_exit(&reclock);
- if (mp && vcache_get(mp, rn, sizeof(rn), &vp) == 0)
+ if (mp && vcache_get(mp, &rn, sizeof(rn), &vp) == 0)
vgone(vp);
}
@@ -1588,7 +1588,7 @@ rump_vop_reclaim(void *v)
struct vnode *vp = ap->a_vp;
struct rumpfs_node *rn = vp->v_data;
- vcache_remove(vp->v_mount, &vp->v_data, sizeof(vp->v_data));
+ vcache_remove(vp->v_mount, &rn, sizeof(rn));
mutex_enter(&reclock);
rn->rn_vp = NULL;
mutex_exit(&reclock);
