shithub: gefs

Info  •  Files  •  Log  •  Branches

fs: move qlock closer to clear op, reorder epoch enter with locking

--- a/fs.c

+++ b/fs.c

@@ -2177,8 +2177,8 @@

 			continue;

 		}

-		epochstart(id);

 		qlock(&fs->mutlk);

+		epochstart(id);

 		switch(m->type){

 		case Tcreate:	fscreate(m);	break;

 		case Twrite:	fswrite(m);	break;

@@ -2188,8 +2188,8 @@

 		default:	abort();	break;

 		}

  		epochend(id);

- 		epochclean();

-		qunlock(&fs->mutlk);

+ 		qunlock(&fs->mutlk);

+		epochclean();

 		if(a != nil)

 			chsend(fs->admchan, a);

@@ -2246,8 +2246,8 @@

 			qunlock(&fs->mutlk);

 			break;

 		case AOclear:

-			qlock(&fs->mutlk);

 			for(off = 0; off < a->length; off += Blksz){

+				qlock(&fs->mutlk);

 				epochstart(id);

 				m.k = buf;

 				m.nk = sizeof(buf);

@@ -2262,8 +2262,9 @@

 					fs->broken++;

 				}

 				epochend(id);

+				qunlock(&fs->mutlk);

+				epochclean();

 			}

-			qunlock(&fs->mutlk);

 			clunkmount(a->mnt);

 			break;

 		}