Module Name:    src
Committed By:   reinoud
Date:           Sat Jul 13 19:42:26 UTC 2013

Modified Files:
        src/sys/fs/udf: udf_rename.c

Log Message:
udf_gro_genealogy() : source and destination should never be the same on call,
KASSERT it instead of checking for it.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/fs/udf/udf_rename.c:1.8
--- src/sys/fs/udf/udf_rename.c:1.7	Sat Jul 13 19:40:14 2013
+++ src/sys/fs/udf/udf_rename.c	Sat Jul 13 19:42:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_rename.c,v 1.7 2013/07/13 19:40:14 reinoud Exp $ */
+/* $NetBSD: udf_rename.c,v 1.8 2013/07/13 19:42:26 reinoud Exp $ */
 
 /*
  * Copyright (c) 2013 Reinoud Zandijk
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.7 2013/07/13 19:40:14 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.8 2013/07/13 19:42:26 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -542,8 +542,7 @@ udf_gro_genealogy(struct mount *mp, kaut
 	ump = target->ump;
 
 	/* if nodes are equal, it is no use looking */
-	if (udf_compare_icb(&source->loc, &target->loc) == 0)
-		return EEXIST;
+	KASSERT(udf_compare_icb(&source->loc, &target->loc) != 0);
 
 	child_node = target;
 	vref(child_node->vnode);

Reply via email to