D53303.id164897.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53303.id164897.diff
View Options

	diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h
	--- a/sys/fs/devfs/devfs_int.h
	+++ b/sys/fs/devfs/devfs_int.h
	@@ -67,6 +67,7 @@
	void *cdp_dtr_cb_arg;

	LIST_HEAD(, cdev_privdata) cdp_fdpriv;
	+ u_int cdp_fdpriv_dtrc;

	struct mtx cdp_threadlock;
	};
	diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
	--- a/sys/fs/devfs/devfs_vnops.c
	+++ b/sys/fs/devfs/devfs_vnops.c
	@@ -200,14 +200,25 @@
	void
	devfs_destroy_cdevpriv(struct cdev_privdata *p)
	{
	+ struct file *fp;
	+ struct cdev_priv *cdp;

	mtx_assert(&cdevpriv_mtx, MA_OWNED);
	- KASSERT(p->cdpd_fp->f_cdevpriv == p,
	- ("devfs_destoy_cdevpriv %p != %p", p->cdpd_fp->f_cdevpriv, p));
	- p->cdpd_fp->f_cdevpriv = NULL;
	+ fp = p->cdpd_fp;
	+ KASSERT(fp->f_cdevpriv == p,
	+ ("devfs_destoy_cdevpriv %p != %p", fp->f_cdevpriv, p));
	+ cdp = cdev2priv((struct cdev *)fp->f_data);
	+ cdp->cdp_fdpriv_dtrc++;
	+ fp->f_cdevpriv = NULL;
	LIST_REMOVE(p, cdpd_list);
	mtx_unlock(&cdevpriv_mtx);
	(p->cdpd_dtr)(p->cdpd_data);
	+ mtx_lock(&cdevpriv_mtx);
	+ MPASS(cdp->cdp_fdpriv_dtrc >= 1);
	+ cdp->cdp_fdpriv_dtrc--;
	+ if (cdp->cdp_fdpriv_dtrc == 0)
	+ wakeup(&cdp->cdp_fdpriv_dtrc);
	+ mtx_unlock(&cdevpriv_mtx);
	free(p, M_CDEVPDATA);
	}

	diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
	--- a/sys/kern/kern_conf.c
	+++ b/sys/kern/kern_conf.c
	@@ -1163,6 +1163,9 @@
	devfs_destroy_cdevpriv(p);
	mtx_lock(&cdevpriv_mtx);
	}
	+ while (cdp->cdp_fdpriv_dtrc != 0) {
	+ msleep(&cdp->cdp_fdpriv_dtrc, &cdevpriv_mtx, 0, "cdfdpc", 0);
	+ }
	mtx_unlock(&cdevpriv_mtx);
	dev_lock();