svn commit: r196873 - in user/kmacy/releng_7_2_fcs_1/sys: cddl/contrib/opensolaris/uts/common/fs/zfs kern sys

Kip Macy kmacy at FreeBSD.org
Sat Sep 5 22:27:45 UTC 2009


Author: kmacy
Date: Sat Sep  5 22:27:44 2009
New Revision: 196873
URL: http://svn.freebsd.org/changeset/base/196873

Log:
  Don't give witness warnings when called from zio_wait

Modified:
  user/kmacy/releng_7_2_fcs_1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/kmacy/releng_7_2_fcs_1/sys/kern/kern_condvar.c
  user/kmacy/releng_7_2_fcs_1/sys/sys/condvar.h

Modified: user/kmacy/releng_7_2_fcs_1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Sat Sep  5 20:35:18 2009	(r196872)
+++ user/kmacy/releng_7_2_fcs_1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Sat Sep  5 22:27:44 2009	(r196873)
@@ -1016,7 +1016,7 @@ zio_wait(zio_t *zio)
 
 	mutex_enter(&zio->io_lock);
 	while (zio->io_executor != NULL)
-		cv_wait(&zio->io_cv, &zio->io_lock);
+		opensolaris_cv_wait(&zio->io_cv, &zio->io_lock);
 	mutex_exit(&zio->io_lock);
 
 	error = zio->io_error;

Modified: user/kmacy/releng_7_2_fcs_1/sys/kern/kern_condvar.c
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/kern/kern_condvar.c	Sat Sep  5 20:35:18 2009	(r196872)
+++ user/kmacy/releng_7_2_fcs_1/sys/kern/kern_condvar.c	Sat Sep  5 22:27:44 2009	(r196873)
@@ -93,7 +93,7 @@ cv_destroy(struct cv *cvp)
  * held when cv_signal or cv_broadcast are called.
  */
 void
-_cv_wait(struct cv *cvp, struct lock_object *lock)
+_cv_wait(struct cv *cvp, struct lock_object *lock, int flags)
 {
 	WITNESS_SAVE_DECL(lock_witness);
 	struct lock_class *class;
@@ -107,10 +107,9 @@ _cv_wait(struct cv *cvp, struct lock_obj
 		ktrcsw(1, 0);
 #endif
 	CV_ASSERT(cvp, lock, td);
-#ifndef WITNESS_SKIPCV
-	WITNESS_WARN(WARN_GIANTOK, lock,
-	    "Waiting on \"%s\"", cvp->cv_description);
-#endif
+	if ((flags & CV_SLEEP_OK) == 0)
+		WITNESS_WARN(WARN_GIANTOK, lock,
+		    "Waiting on \"%s\"", cvp->cv_description);
 	WITNESS_SAVE(lock, lock_witness);
 	class = LOCK_CLASS(lock);
 

Modified: user/kmacy/releng_7_2_fcs_1/sys/sys/condvar.h
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/sys/condvar.h	Sat Sep  5 20:35:18 2009	(r196872)
+++ user/kmacy/releng_7_2_fcs_1/sys/sys/condvar.h	Sat Sep  5 22:27:44 2009	(r196873)
@@ -52,7 +52,7 @@ struct cv {
 void	cv_init(struct cv *cvp, const char *desc);
 void	cv_destroy(struct cv *cvp);
 
-void	_cv_wait(struct cv *cvp, struct lock_object *lock);
+void	_cv_wait(struct cv *cvp, struct lock_object *lock, int flags);
 void	_cv_wait_unlock(struct cv *cvp, struct lock_object *lock);
 int	_cv_wait_sig(struct cv *cvp, struct lock_object *lock);
 int	_cv_timedwait(struct cv *cvp, struct lock_object *lock, int timo);
@@ -61,8 +61,12 @@ int	_cv_timedwait_sig(struct cv *cvp, st
 void	cv_signal(struct cv *cvp);
 void	cv_broadcastpri(struct cv *cvp, int pri);
 
+#define	CV_SLEEP_OK	       0x1
+
 #define	cv_wait(cvp, lock)						\
-	_cv_wait((cvp), &(lock)->lock_object)
+	_cv_wait((cvp), &(lock)->lock_object, 0)
+#define	opensolaris_cv_wait(cvp, lock)					\
+	_cv_wait((cvp), &(lock)->lock_object, CV_SLEEP_OK)
 #define	cv_wait_unlock(cvp, lock)					\
 	_cv_wait_unlock((cvp), &(lock)->lock_object)
 #define	cv_wait_sig(cvp, lock)						\


More information about the svn-src-user mailing list