Module Name: src Committed By: reinoud Date: Wed Jul 10 19:14:07 UTC 2013
Modified Files: src/sys/fs/udf: udf_rename.c Log Message: Remove the dirent checks and references. UDF doesn't need/use them on rename so just to make sure, we remove all references/checks to not trigger bugs thats are not really ours. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/fs/udf/udf_rename.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/fs/udf/udf_rename.c diff -u src/sys/fs/udf/udf_rename.c:1.1 src/sys/fs/udf/udf_rename.c:1.2 --- src/sys/fs/udf/udf_rename.c:1.1 Wed Jul 10 15:10:56 2013 +++ src/sys/fs/udf/udf_rename.c Wed Jul 10 19:14:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: udf_rename.c,v 1.1 2013/07/10 15:10:56 reinoud Exp $ */ +/* $NetBSD: udf_rename.c,v 1.2 2013/07/10 19:14:07 reinoud Exp $ */ /* * Copyright (c) 2013 Reinoud Zandijk @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.1 2013/07/10 15:10:56 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.2 2013/07/10 19:14:07 reinoud Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -329,8 +329,6 @@ udf_gro_rename(struct mount *mp, kauth_c struct vnode *tdvp, struct componentname *tcnp, void *tde, struct vnode *tvp) { - struct dirent **fdirentp = fde; - struct dirent **tdirentp = tde; struct udf_node *fnode, *fdnode, *tnode, *tdnode; struct vattr fvap; int error; @@ -342,11 +340,6 @@ udf_gro_rename(struct mount *mp, kauth_c KASSERT(fvp != NULL); KASSERT(tdvp != NULL); KASSERT(tcnp != NULL); - KASSERT(fdirentp != NULL); - KASSERT(tdirentp != NULL); - KASSERT(fdirentp != tdirentp); - KASSERT((*fdirentp) != (*tdirentp)); - KASSERT((*fdirentp) != NULL); KASSERT(fdvp != fvp); KASSERT(fdvp != tvp); KASSERT(tdvp != fvp);