CVS commit: src/sys/rump

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Mon May  4 14:31:25 UTC 2009

Modified Files:
        src/sys/rump/include/rump: rump.h
        src/sys/rump/librump/rumpvfs: rump_vfs.c

Log Message:
Nuke RUMPCN_HASNTBUF.  The inspiration behind it must've been ... deep.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpvfs/rump_vfs.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/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.16 src/sys/rump/include/rump/rump.h:1.17
--- src/sys/rump/include/rump/rump.h:1.16	Sun May  3 17:09:49 2009
+++ src/sys/rump/include/rump/rump.h	Mon May  4 14:31:25 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.16 2009/05/03 17:09:49 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.17 2009/05/04 14:31:25 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -84,7 +84,6 @@
 void			rump_freecn(struct componentname *, int);
 #define RUMPCN_ISLOOKUP 0x01
 #define RUMPCN_FREECRED 0x02
-#define RUMPCN_HASNTBUF 0x04
 int			rump_namei(uint32_t, uint32_t, const char *,
 				   struct vnode **, struct vnode **,
 				   struct componentname **);

Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.20 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.21
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.20	Sun May  3 17:09:49 2009
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c	Mon May  4 14:31:25 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_vfs.c,v 1.20 2009/05/03 17:09:49 pooka Exp $	*/
+/*	$NetBSD: rump_vfs.c,v 1.21 2009/05/04 14:31:25 pooka Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -218,13 +218,11 @@
 	if (flags & RUMPCN_FREECRED)
 		rump_cred_put(cnp->cn_cred);
 
-	if ((flags & RUMPCN_HASNTBUF) == 0) {
-		if (cnp->cn_flags & SAVENAME) {
-			if (flags & RUMPCN_ISLOOKUP ||cnp->cn_flags & SAVESTART)
-				PNBUF_PUT(cnp->cn_pnbuf);
-		} else {
+	if (cnp->cn_flags & SAVENAME) {
+		if (flags & RUMPCN_ISLOOKUP || cnp->cn_flags & SAVESTART)
 			PNBUF_PUT(cnp->cn_pnbuf);
-		}
+	} else {
+		PNBUF_PUT(cnp->cn_pnbuf);
 	}
 	kmem_free(cnp, sizeof(*cnp));
 }