Module Name: src
Committed By: reinoud
Date: Fri Jul 12 16:14:10 UTC 2013
Modified Files:
src/sys/fs/udf: udf_rename.c
Log Message:
In case there is trouble determining the number of entries in a directory,
return its not empty to be on the safe side.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/fs/udf/udf_rename.c:1.5
--- src/sys/fs/udf/udf_rename.c:1.4 Thu Jul 11 19:41:19 2013
+++ src/sys/fs/udf/udf_rename.c Fri Jul 12 16:14:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_rename.c,v 1.4 2013/07/11 19:41:19 reinoud Exp $ */
+/* $NetBSD: udf_rename.c,v 1.5 2013/07/12 16:14:10 reinoud Exp $ */
/*
* Copyright (c) 2013 Reinoud Zandijk
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.4 2013/07/11 19:41:19 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.5 2013/07/12 16:14:10 reinoud Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -140,7 +140,8 @@ udf_gro_directory_empty_p(struct mount *
error = udf_dirhash_fill(udf_node);
if (error) {
dirhash_put(udf_node->dir_hash);
- return error;
+ /* VERY unlikely, answer its not empty */
+ return 0;
}
/* check to see if the directory is empty */
