diff options
| author | fr80241 <none@none> | 2007-05-03 09:19:29 -0700 |
|---|---|---|
| committer | fr80241 <none@none> | 2007-05-03 09:19:29 -0700 |
| commit | 32cacfe437772cd5ff352d51b80d48c4863e13a6 (patch) | |
| tree | 7965d3af928e0a8ed4f056b18e81776cfc5aeaa9 /usr/src | |
| parent | c1f8b08e52d9b30bd55daeac694e3a7f50d3cd21 (diff) | |
| download | illumos-gate-32cacfe437772cd5ff352d51b80d48c4863e13a6.tar.gz | |
6500850 nca causes system panic with specweb2005 workloads and sws
6517033 ncalogd causes panic due to null pointer to logd
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/sockfs/nl7clogd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/uts/common/fs/sockfs/nl7clogd.c b/usr/src/uts/common/fs/sockfs/nl7clogd.c index 92f935fe91..1af7c4e629 100644 --- a/usr/src/uts/common/fs/sockfs/nl7clogd.c +++ b/usr/src/uts/common/fs/sockfs/nl7clogd.c @@ -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 @@ nl7c_logd_init(int fsz, caddr_t *fnv) 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 @@ error: if (dvp) VN_RELE(dvp); - mutex_exit(&logd.lock); return (B_FALSE); } |