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

Add a function to clean up RAID5 packets and use it when I/O has

Browse Source 
finished or when building the complete packet fails.
This commit is contained in:
Lukas Ertl 2004-06-23 23:52:55 +00:00
parent bdf8ab4692
commit 3a1e11b485
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/geom/vinum/geom_vinum_plex.c
View File

@ -275,6 +275,8 @@ gv_plex_start(struct bio *bp)
boff);
if (err) {
if (p->org == GV_PLEX_RAID5)
gv_free_raid5_packet(wp);
bp->bio_completed += bcount;
if (bp->bio_error == 0)
bp->bio_error = err;

33
sys/geom/vinum/geom_vinum_raid5.c
View File

@ -70,6 +70,26 @@ gv_new_raid5_packet(void)
return (wp);
}
void
gv_free_raid5_packet(struct gv_raid5_packet *wp)
{
struct gv_raid5_bit *r, *r2;
/* Remove all the bits from this work packet. */
TAILQ_FOREACH_SAFE(r, &wp->bits, list, r2) {
TAILQ_REMOVE(&wp->bits, r, list);
if (r->malloc)
g_free(r->buf);
if (r->bio != NULL)
g_destroy_bio(r->bio);
g_free(r);
}
if (wp->bufmalloc == 1)
g_free(wp->buf);
g_free(wp);
}
/*
* Check if the stripe that the work packet wants is already being used by
* some other work packet.
@ -140,9 +160,7 @@ gv_raid5_worker(void *arg)
mtx_lock(&p->worklist_mtx);
}
TAILQ_REMOVE(&p->worklist, wp, list);
if (wp->bufmalloc == 1)
g_free(wp->buf);
g_free(wp);
gv_free_raid5_packet(wp);
restart++;
/*break;*/
}
@ -238,15 +256,6 @@ gv_raid5_done(struct bio *bp)
break;
}
g_destroy_bio(bp);
if (rbp != NULL) {
if (rbp->malloc == 1)
g_free(rbp->buf);
TAILQ_REMOVE(&wp->bits, rbp, list);
g_free(rbp);
}
/* This request group is done. */
if (wp->active == 0)
wp->state = FINISH;

1
sys/geom/vinum/geom_vinum_raid5.h
View File

@ -85,6 +85,7 @@ struct gv_raid5_packet {
int gv_build_raid5_req(struct gv_raid5_packet *, struct bio *, caddr_t,
long, off_t);
void gv_free_raid5_packet(struct gv_raid5_packet *);
void gv_raid5_done(struct bio *);
void gv_raid5_worker(void *);
struct gv_raid5_packet *gv_new_raid5_packet(void);