git: b4bf7bdeb70d - stable/12 - Giant: move back Giant removal until 14

Warner Losh imp at FreeBSD.org
Wed Feb 17 21:56:44 UTC 2021


The branch stable/12 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b4bf7bdeb70d9378bcff6de889bd8047fd3e13a2

commit b4bf7bdeb70d9378bcff6de889bd8047fd3e13a2
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-02-17 16:28:41 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-02-17 21:55:38 +0000

    Giant: move back Giant removal until 14
    
    Update the Giant Lock warning message to FreeBSD 14. It's growing increasling
    clear that this won't be done before 13.0.
    
    MFC: Insta (re@'s request)
    Approved by: re@ (gjb for 13.0 release cycle)
    (cherry picked from commit 00065c7630c25850298dd3ba6919c2d3628e8ad9)
---
 sys/kern/kern_conf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 242ba15a1b49..089ec5bd6c3f 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -665,6 +665,9 @@ prep_cdevsw(struct cdevsw *devsw, int flags)
 	}
 	
 	if (devsw->d_flags & D_NEEDGIANT) {
+		printf("WARNING: Device \"%s\" is Giant locked and may be "
+		    "deleted before FreeBSD 14.0.\n",
+		    devsw->d_name == NULL ? "???" : devsw->d_name);
 		if (devsw->d_gianttrick == NULL) {
 			memcpy(dsw2, devsw, sizeof *dsw2);
 			devsw->d_gianttrick = dsw2;


More information about the dev-commits-src-all mailing list