Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern Fix md(4) double attachment in TFTPROOT option
details: https://anonhg.NetBSD.org/src/rev/93c09075f483
branches: trunk
changeset: 359349:93c09075f483
user: manu <manu%NetBSD.org@localhost>
date: Wed Feb 07 15:51:35 2018 +0000
description:
Fix md(4) double attachment in TFTPROOT option
The mdattach() call in tftproot_dhcpboot() has probably always been
useless, but it seems it became harmful, as it causes 7.1.1 to deadlock
during boot.
diffstat:
sys/kern/subr_tftproot.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diffs (35 lines):
diff -r b637d44216aa -r 93c09075f483 sys/kern/subr_tftproot.c
--- a/sys/kern/subr_tftproot.c Wed Feb 07 14:42:07 2018 +0000
+++ b/sys/kern/subr_tftproot.c Wed Feb 07 15:51:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_tftproot.c,v 1.19 2016/10/31 15:27:24 maxv Exp $ */
+/* $NetBSD: subr_tftproot.c,v 1.20 2018/02/07 15:51:35 manu Exp $ */
/*-
* Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
#include "opt_md.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.19 2016/10/31 15:27:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.20 2018/02/07 15:51:35 manu Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -65,8 +65,6 @@
#include <nfs/nfsdiskless.h>
#include <nfs/nfs_var.h>
-extern void mdattach(int);
-
/*
* Copied from <lib/libsa/tftp.h>
*/
@@ -333,7 +331,6 @@
DPRINTF(("%s():%d RAMdisk loaded: %ld@%p\n",
__func__, __LINE__, trh->trh_len, trh->trh_base));
md_root_setconf(trh->trh_base, trh->trh_len);
- mdattach(0);
error = 0;
out:
Home |
Main Index |
Thread Index |
Old Index