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

Add a destroy_geom method to the slice "library".

Browse Source 
If a slice class has no destroy_geom method, use this one.

This should allow all slicers to kldload.
This commit is contained in:
phk 2003-05-31 19:25:05 +00:00
parent 6c006113be
commit e218a141d0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/geom/geom_slice.c
View File

@ -300,13 +300,12 @@ g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length
struct g_slice *gsl;
va_list ap;
struct sbuf *sb;
int error, acc;
int acc;
g_trace(G_T_TOPOLOGY, "g_slice_config(%s, %d, %d)",
gp->name, idx, how);
g_topology_assert();
gsp = gp->softc;
error = 0;
if (idx >= gsp->nslice)
return(EINVAL);
gsl = &gsp->slices[idx];
@ -430,6 +429,14 @@ g_slice_spoiled(struct g_consumer *cp)
g_wither_geom(gp, ENXIO);
}
int
g_slice_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp)
{
g_slice_spoiled(LIST_FIRST(&gp->consumer));
return (0);
}
struct g_geom *
g_slice_new(struct g_class *mp, u_int slices, struct g_provider *pp, struct g_consumer **cpp, void *extrap, int extra, g_slice_start_t *start)
{
@ -450,6 +457,8 @@ g_slice_new(struct g_class *mp, u_int slices, struct g_provider *pp, struct g_co
gp->start = g_slice_start;
gp->spoiled = g_slice_spoiled;
gp->dumpconf = g_slice_dumpconf;
if (gp->class->destroy_geom == NULL)
gp->class->destroy_geom = g_slice_destroy_geom;
cp = g_new_consumer(gp);
error = g_attach(cp, pp);
if (error == 0)

2
sys/geom/geom_slice.h
View File

@ -82,6 +82,8 @@ int g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t offset, off_t length, i
#define G_SLICE_HOT_START 4
#define G_SLICE_HOT_CALL 8
int g_slice_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp);
void g_slice_finish_hot(struct bio *bp);
#endif /* _GEOM_GEOM_SLICE_H_ */