shithub: gefs

Info  •  Files  •  Log  •  Branches

qgen: push down into qput

this makes it impossible to miss the queue ordering.

--- a/blk.c

+++ b/blk.c

@@ -894,7 +894,6 @@

 			qe.op = Qfree;

 			qe.bp = p->bp;

 			qe.b = nil;

-			qe.qgen = agetv(&fs->qgen);

 			qput(a->sync, qe);

 			if(p->b != nil){

 				setflag(p->b, Bfreed);

@@ -921,7 +920,6 @@

 	holdblk(b);

 	finalize(b);

 	qe.op = Qwrite;

-	qe.qgen = agetv(&fs->qgen);

 	qe.bp = b->bp;

 	qe.b = b;

 	qput(a->sync, qe);

@@ -961,6 +959,7 @@

 	int i;

 	qlock(&q->lk);

+	qe.qgen = agetv(&fs->qgen);

 	while(q->nheap == q->heapsz)

 		rsleep(&q->fullrz);

 	for(i = q->nheap; i > 0; i = (i-1)/2){