git: 9front

Info  •  Files  •  Log  •  Branches

cwfs: rollback last change

the ref qlock is required to keep requests in order for flushes, sorry.

--- a/sys/src/cmd/cwfs/all.h

+++ b/sys/src/cmd/cwfs/all.h

@@ -56,7 +56,6 @@

 Queue*	serveq;

 Queue*	raheadq;

 Rabuf*	rabuffree;

-QLock	reflock;

 Lock	rabuflock;

 Tlock	tlocks[NTLOCK];

 Lock	tlocklock;

--- a/sys/src/cmd/cwfs/main.c

+++ b/sys/src/cmd/cwfs/main.c

@@ -314,8 +314,6 @@

 		printsizes();

 	}

-	qlock(&reflock);

-	qunlock(&reflock);

 	serveq = newqueue(1000, "9P service");	/* tunable */

 	raheadq = newqueue(1000, "readahead");	/* tunable */

@@ -451,7 +449,6 @@

 	Msgbuf *mb;

 	for (;;) {

-		qlock(&reflock);

 		/* read 9P request from a network input process */

 		mb = fs_recv(serveq, 0);

 		assert(mb->magic == Mbmagic);

@@ -460,7 +457,6 @@

 		if (cp == nil)

 			panic("serve: nil mb->chan");

 		rlock(&cp->reflock);

-		qunlock(&reflock);

 		rlock(&mainlock);

-- 

⑨