From owner-svn-src-all@freebsd.org Wed Mar 21 14:47:02 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18BBDF468D7;
Wed, 21 Mar 2018 14:47:02 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id AC27C72CF6;
Wed, 21 Mar 2018 14:47:01 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD0322C0A4;
Wed, 21 Mar 2018 14:46:59 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2LEkxDL091828;
Wed, 21 Mar 2018 14:46:59 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2LEkxSb091827;
Wed, 21 Mar 2018 14:46:59 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201803211446.w2LEkxSb091827@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 21 Mar 2018 14:46:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r331295 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 331295
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Mar 2018 14:47:02 -0000
Author: imp
Date: Wed Mar 21 14:46:59 2018
New Revision: 331295
URL: https://svnweb.freebsd.org/changeset/base/331295
Log:
bufshutdown is no longer called with Giant held, so there's no need to
drop or pickup Giant anymore. Remove that code and adjust comments.
Modified:
head/sys/kern/vfs_bio.c
Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c Wed Mar 21 14:46:54 2018 (r331294)
+++ head/sys/kern/vfs_bio.c Wed Mar 21 14:46:59 2018 (r331295)
@@ -1376,25 +1376,20 @@ bufshutdown(int show_busybufs)
#ifdef PREEMPTION
/*
- * Drop Giant and spin for a while to allow
- * interrupt threads to run.
+ * Spin for a while to allow interrupt threads to run.
*/
- DROP_GIANT();
DELAY(50000 * iter);
- PICKUP_GIANT();
#else
/*
- * Drop Giant and context switch several times to
- * allow interrupt threads to run.
+ * Context switch several times to allow interrupt
+ * threads to run.
*/
- DROP_GIANT();
for (subiter = 0; subiter < 50 * iter; subiter++) {
thread_lock(curthread);
mi_switch(SW_VOL, NULL);
thread_unlock(curthread);
DELAY(1000);
}
- PICKUP_GIANT();
#endif
}
printf("\n");