Module Name: src
Committed By: pooka
Date: Wed Dec 23 01:15:11 UTC 2009
Modified Files:
src/lib/libp2k: p2k.c
Log Message:
Technically we're supposed to use flags from the RUMP_NAMEI namespace
instead of NAMEI directly. Probably doesn't matter in practise,
since the chances of this running on non-NetBSD are low. But make
it correct anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libp2k/p2k.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.32 src/lib/libp2k/p2k.c:1.33
--- src/lib/libp2k/p2k.c:1.32 Wed Dec 23 01:11:39 2009
+++ src/lib/libp2k/p2k.c Wed Dec 23 01:15:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.32 2009/12/23 01:11:39 pooka Exp $ */
+/* $NetBSD: p2k.c,v 1.33 2009/12/23 01:15:11 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -626,10 +626,10 @@
* even issue ABORT properly, so just free resources
* on the fly and hope for the best. PR kern/42348
*/
- if (pcn->pcn_flags & NAMEI_INRENAME) {
- if (pcn->pcn_nameiop == NAMEI_DELETE) {
+ if (pcn->pcn_flags & RUMP_NAMEI_INRENAME) {
+ if (pcn->pcn_nameiop == RUMP_NAMEI_DELETE) {
/* save path from the first lookup */
- if (pcn->pcn_flags & NAMEI_SAVESTART) {
+ if (pcn->pcn_flags & RUMP_NAMEI_SAVESTART) {
if (p2n_dir->p2n_cn_ren_src)
freecn(p2n_dir->p2n_cn_ren_src,
RUMPCN_FORCEFREE);
@@ -639,7 +639,7 @@
cn = NULL;
}
} else {
- assert(pcn->pcn_nameiop == NAMEI_RENAME);
+ assert(pcn->pcn_nameiop == RUMP_NAMEI_RENAME);
if (p2n_dir->p2n_cn_ren_targ)
freecn(p2n_dir->p2n_cn_ren_targ,
RUMPCN_FORCEFREE);
@@ -663,8 +663,8 @@
p2n = getp2n(p2m, vp, false, NULL);
if (p2n == NULL) {
- if (pcn->pcn_flags & NAMEI_INRENAME) {
- if (pcn->pcn_nameiop == NAMEI_DELETE) {
+ if (pcn->pcn_flags & RUMP_NAMEI_INRENAME) {
+ if (pcn->pcn_nameiop == RUMP_NAMEI_DELETE) {
p2n_dir->p2n_cn_ren_src = NULL;
} else {
p2n_dir->p2n_cn_ren_targ = NULL;
