kern/100046: [patch] mutex lock errors in drivers

[Craig Rodrigues]

The following reply was made to PR kern/100046; it has been noted by GNATS.

From: Craig Rodrigues <rodrigc at crodrigues.org>
To: bug-followup at freebsd.org
Cc:  
Subject: Re: kern/100046: [patch] mutex lock errors in drivers
Date: Wed, 12 Jul 2006 01:09:18 -0400

 Here is the actual patch missing from the PR.
 
 
 Index: aac_cam.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/dev/aac/aac_cam.c,v
 retrieving revision 1.22
 diff -u -u -r1.22 aac_cam.c
 --- aac_cam.c	8 Oct 2005 15:55:09 -0000	1.22
 +++ aac_cam.c	12 Jul 2006 05:06:23 -0000
 @@ -414,6 +414,7 @@
  		} else {
  			ccb->ccb_h.status = CAM_REQ_CMP;
  			xpt_done(ccb);
 +			mtx_unlock(&sc->aac_io_lock);
  			return;
  		}
  	default:
 Index: scsi_cd.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/cam/scsi/scsi_cd.c,v
 retrieving revision 1.95
 diff -u -u -r1.95 scsi_cd.c
 --- scsi_cd.c	17 Apr 2006 09:12:53 -0000	1.95
 +++ scsi_cd.c	12 Jul 2006 05:07:23 -0000
 @@ -591,6 +591,7 @@
  
  	if (softc->sysctl_tree == NULL) {
  		printf("cdsysctlinit: unable to allocate sysctl tree\n");
 +		mtx_unlock(&Giant);
  		return;
  	}
  
 Index: scsi_da.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/cam/scsi/scsi_da.c,v
 retrieving revision 1.190
 diff -u -u -r1.190 scsi_da.c
 --- scsi_da.c	18 Apr 2006 22:01:59 -0000	1.190
 +++ scsi_da.c	12 Jul 2006 05:07:23 -0000
 @@ -1001,6 +1001,7 @@
  		CTLFLAG_RD, 0, tmpstr);
  	if (softc->sysctl_tree == NULL) {
  		printf("dasysctlinit: unable to allocate sysctl tree\n");
 +		mtx_unlock(&Giant);
  		return;
  	}