Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix renaming over mismatched non-directory types in tmpfs. 

Renaming a file of any non-directory type over another file of any
other non-directory type is OK -- they need not match as long as
neither is a directory, so loosen the kassert to reflect this.

XXX Need to write test cases for this.

ok dholland, rmind
This commit is contained in:
riastradh 2011-07-13 03:28:41 +00:00
parent 75e98e4690
commit e203e3912f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/tmpfs/tmpfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tmpfs_vnops.c,v 1.87 2011/06/12 03:35:54 rmind Exp $ */
/* $NetBSD: tmpfs_vnops.c,v 1.88 2011/07/13 03:28:41 riastradh Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.87 2011/06/12 03:35:54 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.88 2011/07/13 03:28:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@ -979,7 +979,7 @@ tmpfs_rename(void *v)
tde = tmpfs_dir_lookup(tdnode, tcnp);
}
KASSERT(tde && tde->td_node == tnode);
KASSERT(tnode->tn_type == fnode->tn_type);
KASSERT((tnode->tn_type == VDIR) == (fnode->tn_type == VDIR));
/*
* Remove and destroy the directory entry on the target