Module Name: src
Committed By: reinoud
Date: Wed May 20 15:30:26 UTC 2009
Modified Files:
src/sys/fs/udf: udf_strat_direct.c udf_strat_rmw.c
udf_strat_sequential.c udf_subr.c
Log Message:
Retire IN_CALLBACK_ULK flagging since its not used anymore and the old
assertions on it would trigger without cause.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/fs/udf/udf_strat_direct.c \
src/sys/fs/udf/udf_strat_sequential.c
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/udf/udf_strat_rmw.c
cvs rdiff -u -r1.90 -r1.91 src/sys/fs/udf/udf_subr.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_strat_direct.c
diff -u src/sys/fs/udf/udf_strat_direct.c:1.9 src/sys/fs/udf/udf_strat_direct.c:1.10
--- src/sys/fs/udf/udf_strat_direct.c:1.9 Tue Feb 10 17:49:02 2009
+++ src/sys/fs/udf/udf_strat_direct.c Wed May 20 15:30:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_direct.c,v 1.9 2009/02/10 17:49:02 reinoud Exp $ */
+/* $NetBSD: udf_strat_direct.c,v 1.10 2009/05/20 15:30:26 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_direct.c,v 1.9 2009/02/10 17:49:02 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_direct.c,v 1.10 2009/05/20 15:30:26 reinoud Exp $");
#endif /* not lint */
@@ -115,9 +115,7 @@
udf_node->outstanding_nodedscr--;
if (udf_node->outstanding_nodedscr == 0) {
/* unlock the node */
- KASSERT(udf_node->i_flags & IN_CALLBACK_ULK);
- UDF_UNLOCK_NODE(udf_node, IN_CALLBACK_ULK);
-
+ UDF_UNLOCK_NODE(udf_node, 0);
wakeup(&udf_node->outstanding_nodedscr);
}
/* unreference the vnode so it can be recycled */
Index: src/sys/fs/udf/udf_strat_sequential.c
diff -u src/sys/fs/udf/udf_strat_sequential.c:1.9 src/sys/fs/udf/udf_strat_sequential.c:1.10
--- src/sys/fs/udf/udf_strat_sequential.c:1.9 Tue Feb 10 17:48:19 2009
+++ src/sys/fs/udf/udf_strat_sequential.c Wed May 20 15:30:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_sequential.c,v 1.9 2009/02/10 17:48:19 reinoud Exp $ */
+/* $NetBSD: udf_strat_sequential.c,v 1.10 2009/05/20 15:30:26 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_sequential.c,v 1.9 2009/02/10 17:48:19 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_sequential.c,v 1.10 2009/05/20 15:30:26 reinoud Exp $");
#endif /* not lint */
@@ -125,9 +125,7 @@
udf_node->outstanding_nodedscr--;
if (udf_node->outstanding_nodedscr == 0) {
/* first unlock the node */
- KASSERT(udf_node->i_flags & IN_CALLBACK_ULK);
- UDF_UNLOCK_NODE(udf_node, IN_CALLBACK_ULK);
-
+ UDF_UNLOCK_NODE(udf_node, 0);
wakeup(&udf_node->outstanding_nodedscr);
}
Index: src/sys/fs/udf/udf_strat_rmw.c
diff -u src/sys/fs/udf/udf_strat_rmw.c:1.18 src/sys/fs/udf/udf_strat_rmw.c:1.19
--- src/sys/fs/udf/udf_strat_rmw.c:1.18 Sun Feb 8 19:14:52 2009
+++ src/sys/fs/udf/udf_strat_rmw.c Wed May 20 15:30:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.18 2009/02/08 19:14:52 reinoud Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.19 2009/05/20 15:30:26 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.18 2009/02/08 19:14:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.19 2009/05/20 15:30:26 reinoud Exp $");
#endif /* not lint */
@@ -698,7 +698,7 @@
holdrele(udf_node->vnode);
udf_node->outstanding_nodedscr--;
if (udf_node->outstanding_nodedscr == 0) {
- UDF_UNLOCK_NODE(udf_node, udf_node->i_flags & IN_CALLBACK_ULK);
+ UDF_UNLOCK_NODE(udf_node, 0);
wakeup(&udf_node->outstanding_nodedscr);
}
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.90 src/sys/fs/udf/udf_subr.c:1.91
--- src/sys/fs/udf/udf_subr.c:1.90 Wed May 20 13:25:50 2009
+++ src/sys/fs/udf/udf_subr.c Wed May 20 15:30:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.90 2009/05/20 13:25:50 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.91 2009/05/20 15:30:26 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.90 2009/05/20 13:25:50 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.91 2009/05/20 15:30:26 reinoud Exp $");
#endif /* not lint */
@@ -5420,7 +5420,7 @@
{
union dscrptr *dscr;
struct long_ad *loc;
- int extnr, flags, error;
+ int extnr, error;
DPRINTF(NODE, ("udf_writeout_node called\n"));
@@ -5435,8 +5435,7 @@
}
/* lock node */
- flags = waitfor ? 0 : IN_CALLBACK_ULK;
- UDF_LOCK_NODE(udf_node, flags);
+ UDF_LOCK_NODE(udf_node, 0);
/* at least one descriptor writeout */
udf_node->outstanding_nodedscr = 1;
