From owner-freebsd-bugs@FreeBSD.ORG  Tue Nov  6 13:30:03 2007
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0FCC116A41B
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  6 Nov 2007 13:30:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id EADE613C4B7
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  6 Nov 2007 13:30:02 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id lA6DU2AJ036668
	for <freebsd-bugs@freefall.freebsd.org>; Tue, 6 Nov 2007 13:30:02 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.1/8.14.1/Submit) id lA6DU2jv036665;
	Tue, 6 Nov 2007 13:30:02 GMT (envelope-from gnats)
Date: Tue, 6 Nov 2007 13:30:02 GMT
Message-Id: <200711061330.lA6DU2jv036665@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Kostik Belousov <kostikbel@gmail.com>
Cc: 
Subject: Re: kern/116539: [fdc] fdc(4) marks /dev/fd0 device busy when it
	should not, so does not allow to kldunload fdc.ko
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Kostik Belousov <kostikbel@gmail.com>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2007 13:30:03 -0000

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

From: Kostik Belousov <kostikbel@gmail.com>
To: bug-followup@FreeBSD.org
Cc: eugen@grosbein.pp.ru
Subject: Re: kern/116539: [fdc] fdc(4) marks /dev/fd0 device busy when it should not, so does not allow to kldunload fdc.ko
Date: Tue, 6 Nov 2007 15:25:58 +0200

 device_busy() is counted. Try the following patch:
 
 diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
 index ea033a5..812823a 100644
 --- a/sys/dev/fdc/fdc.c
 +++ b/sys/dev/fdc/fdc.c
 @@ -1383,6 +1383,7 @@ fd_access(struct g_provider *pp, int r, int w, int e)
  	struct fd_data *fd;
  	struct fdc_data *fdc;
  	int ar, aw, ae;
 +	int busy;
  
  	fd = pp->geom->softc;
  	fdc = fd->fdc;
 @@ -1403,6 +1404,7 @@ fd_access(struct g_provider *pp, int r, int w, int e)
  		return (0);
  	}
  
 +	busy = 0;
  	if (pp->acr == 0 && pp->acw == 0 && pp->ace == 0) {
  		if (fdmisccmd(fd, BIO_PROBE, NULL))
  			return (ENXIO);
 @@ -1415,10 +1417,14 @@ fd_access(struct g_provider *pp, int r, int w, int e)
  			mtx_unlock(&fdc->fdc_mtx);
  		}
  		device_busy(fd->dev);
 +		busy = 1;
  	}
  
 -	if (w > 0 && (fd->flags & FD_WP))
 +	if (w > 0 && (fd->flags & FD_WP)) {
 +		if (busy)
 +			device_unbusy(fd->dev);
  		return (EROFS);
 +	}
  
  	pp->sectorsize = fd->sectorsize;
  	pp->stripesize = fd->ft->heads * fd->ft->sectrac * fd->sectorsize;