[src/trunk]: src/sys/rump/librump/rumpvfs unionfs voodoo

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9efc46a840c3
branches:  trunk
changeset: 760762:9efc46a840c3
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Jan 12 21:08:55 2011 +0000

description:
unionfs voodoo

diffstat:

 sys/rump/librump/rumpvfs/rumpfs.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 06df26b21b8d -r 9efc46a840c3 sys/rump/librump/rumpvfs/rumpfs.c
--- a/sys/rump/librump/rumpvfs/rumpfs.c Wed Jan 12 19:55:06 2011 +0000
+++ b/sys/rump/librump/rumpvfs/rumpfs.c Wed Jan 12 21:08:55 2011 +0000
@@ -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: