From owner-svn-src-user@FreeBSD.ORG Sat Sep 5 22:27:45 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D01E1065672; Sat, 5 Sep 2009 22:27:45 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 60F3A8FC0A; Sat, 5 Sep 2009 22:27:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n85MRj09065593; Sat, 5 Sep 2009 22:27:45 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n85MRjsA065592; Sat, 5 Sep 2009 22:27:45 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200909052227.n85MRjsA065592@svn.freebsd.org> From: Kip Macy Date: Sat, 5 Sep 2009 22:27:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196873 - in user/kmacy/releng_7_2_fcs_1/sys: cddl/contrib/opensolaris/uts/common/fs/zfs kern sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2009 22:27:45 -0000 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) \