Mercurial > illumos > illumos-gate
changeset 4155:3e38fab0382c
6500850 nca causes system panic with specweb2005 workloads and sws
6517033 ncalogd causes panic due to null pointer to logd
author | fr80241 |
---|---|
date | Thu, 03 May 2007 09:19:29 -0700 |
parents | bd1265f2f9de |
children | da0f64b64bfa |
files | usr/src/uts/common/fs/sockfs/nl7clogd.c |
diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/sockfs/nl7clogd.c Thu May 03 08:24:50 2007 -0700 +++ b/usr/src/uts/common/fs/sockfs/nl7clogd.c Thu May 03 09:19:29 2007 -0700 @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -447,8 +446,8 @@ symlink_dir, ret); goto error; } - nca_fio_dvp(&fio) = dvp; } + nca_fio_dvp(&fio) = dvp; /* No symlink so don't know were to start from */ goto fresh_start; } @@ -591,7 +590,6 @@ if (dvp) VN_RELE(dvp); - mutex_exit(&logd.lock); return (B_FALSE); }