Module Name: src
Committed By: pooka
Date: Wed Jul 14 16:59:35 UTC 2010
Modified Files:
src/tests/fs/puffs/h_dtfs: dtfs_vnops.c
Log Message:
* remove target node from right directory
* remove what i guess to be a useless if-clause (although with
file systems you can never be sure)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/puffs/h_dtfs/dtfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/puffs/h_dtfs/dtfs_vnops.c
diff -u src/tests/fs/puffs/h_dtfs/dtfs_vnops.c:1.3 src/tests/fs/puffs/h_dtfs/dtfs_vnops.c:1.4
--- src/tests/fs/puffs/h_dtfs/dtfs_vnops.c:1.3 Wed Jul 14 14:22:15 2010
+++ src/tests/fs/puffs/h_dtfs/dtfs_vnops.c Wed Jul 14 16:59:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dtfs_vnops.c,v 1.3 2010/07/14 14:22:15 pooka Exp $ */
+/* $NetBSD: dtfs_vnops.c,v 1.4 2010/07/14 16:59:35 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -319,10 +319,6 @@
dfd_src = dtfs_dirgetbyname(DTFS_PTOF(pn_sdir),
pcn_src->pcn_name, pcn_src->pcn_namelen);
- /* asked for "." or ".." XXX: make sure? */
- if (!dfd_src)
- return EINVAL;
-
/* if there's a target file, nuke it for atomic replacement */
if (pn_tfile) {
if (pn_tfile->pn_va.va_type == VDIR) {
@@ -330,7 +326,7 @@
if (!LIST_EMPTY(&df_targ->df_dirents))
return ENOTEMPTY;
}
- dtfs_nukenode(pn_tfile, pn_sdir,
+ dtfs_nukenode(pn_tfile, pn_tdir,
pcn_targ->pcn_name, pcn_targ->pcn_namelen);
}
