d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the SI_CANDELETE flag on the dev_t rather than the D_CANFREE flag

Browse Source 
on the cdevsw to determine ability to handle the BIO_DELETE request.
This commit is contained in:
Poul-Henning Kamp 2003-02-11 12:49:58 +00:00
parent cadb987095
commit 88b1af7730
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/fs/specfs/spec_vnops.c
View File

@ -562,15 +562,13 @@ spec_freeblks(ap)
daddr_t a_length;
} */ *ap;
{
struct cdevsw *bsw;
struct buf *bp;
/*
* XXX: This assumes that strategy does the deed right away.
* XXX: this may not be TRTTD.
*/
bsw = devsw(ap->a_vp->v_rdev);
if ((bsw->d_flags & D_CANFREE) == 0)
if ((ap->a_vp->v_rdev->si_flags & SI_CANDELETE) == 0)
return (0);
bp = geteblk(ap->a_length);
bp->b_iocmd = BIO_DELETE;

4
sys/geom/geom_dev.c
View File

@ -72,7 +72,7 @@ static struct cdevsw g_dev_cdevsw = {
/* maj */ GEOM_MAJOR,
/* dump */ nodump,
/* psize */ g_dev_psize,
/* flags */ D_DISK | D_CANFREE | D_TRACKCLOSE,
/* flags */ D_DISK | D_TRACKCLOSE,
/* kqfilter */ nokqfilter
};
@ -171,6 +171,8 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, int insist __unused)
mtx_lock(&Giant);
dev = make_dev(&g_dev_cdevsw, unit2minor(unit++),
UID_ROOT, GID_OPERATOR, 0640, gp->name);
if (pp->flags & G_PF_CANDELETE)
dev->si_flags |= SI_CANDELETE;
mtx_unlock(&Giant);
g_topology_lock();