Module Name: src
Committed By: pooka
Date: Wed Jan 12 21:08:55 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
unionfs voodoo
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 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.85 src/sys/rump/librump/rumpvfs/rumpfs.c:1.86
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.85 Wed Jan 12 19:31:39 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Jan 12 21:08:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.85 2011/01/12 19:31:39 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.86 2011/01/12 21:08: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.85 2011/01/12 19:31:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.86 2011/01/12 21:08:55 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -145,7 +145,7 @@
NULL
};
-#define RUMPFS_WHITEOUT NULL
+#define RUMPFS_WHITEOUT ((void *)-1)
#define RDENT_ISWHITEOUT(rdp) (rdp->rd_node == RUMPFS_WHITEOUT)
struct rumpfs_dent {
char *rd_name;
@@ -731,6 +731,11 @@
return EJUSTRETURN;
}
+ if (RDENT_ISWHITEOUT(rd)) {
+ cnp->cn_flags |= ISWHITEOUT;
+ return ENOENT;
+ }
+
rn = rd->rd_node;
getvnode:
