From owner-svn-src-user@FreeBSD.ORG Wed Jul 24 07:48:09 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0F947804; Wed, 24 Jul 2013 07:48:09 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 015142F0F; Wed, 24 Jul 2013 07:48:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O7m88Y062744; Wed, 24 Jul 2013 07:48:08 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O7m8QA062743; Wed, 24 Jul 2013 07:48:08 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201307240748.r6O7m8QA062743@svn.freebsd.org> From: Attilio Rao Date: Wed, 24 Jul 2013 07:48:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253595 - user/attilio/vmobj-readlock/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 24 Jul 2013 07:48:09 -0000 Author: attilio Date: Wed Jul 24 07:48:08 2013 New Revision: 253595 URL: http://svnweb.freebsd.org/changeset/base/253595 Log: Remove diagnostics. Sponsored by: EMC / Isilon storage division Reported by: jeff Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.c Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.c ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/vm_page.c Wed Jul 24 07:46:15 2013 (r253594) +++ user/attilio/vmobj-readlock/sys/vm/vm_page.c Wed Jul 24 07:48:08 2013 (r253595) @@ -477,14 +477,11 @@ vm_page_reference(vm_page_t m) void vm_page_busy_downgrade(vm_page_t m) { - u_int retry, x; + u_int x; vm_page_busy_assert_wlocked(m); - retry = 0; for (;;) { - if (retry++ > 0) - panic("vm_page_busy_downgrade: failed loop %p", m); x = m->busy_lock; x &= VPB_LOCK_WAITERS; if (atomic_cmpset_rel_int(&m->busy_lock, @@ -516,14 +513,11 @@ vm_page_busy_rlocked(vm_page_t m) void vm_page_busy_runlock(vm_page_t m) { - u_int retry, x; + u_int x; vm_page_busy_assert_rlocked(m); - retry = 0; for (;;) { - if (retry++ > 10000) - panic("vm_page_busy_runlock: failed loop %p", m); x = m->busy_lock; if (VPB_READERS(x) > 1) { if (atomic_cmpset_int(&m->busy_lock, x, @@ -628,14 +622,11 @@ vm_page_busy_wunlock_hard(vm_page_t m) void vm_page_flash(vm_page_t m) { - u_int retry, x; + u_int x; vm_page_lock_assert(m, MA_OWNED); - retry = 0; for (;;) { - if (retry++ > 1000) - panic("vm_page_flash: failed loop %p", m); x = m->busy_lock; if ((x & VPB_LOCK_WAITERS) == 0) return;