Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/fs/udf Remove the dirent checks and references. UDF does...



details:   https://anonhg.NetBSD.org/src/rev/1ea0f227ca2d
branches:  trunk
changeset: 787875:1ea0f227ca2d
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Wed Jul 10 19:14:07 2013 +0000

description:
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.

diffstat:

 sys/fs/udf/udf_rename.c |  11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r 8d7661556dc0 -r 1ea0f227ca2d sys/fs/udf/udf_rename.c
--- a/sys/fs/udf/udf_rename.c   Wed Jul 10 19:07:20 2013 +0000
+++ b/sys/fs/udf/udf_rename.c   Wed Jul 10 19:14:07 2013 +0000
@@ -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 @@
     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 @@
        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);



Home | Main Index | Thread Index | Old Index