From 308bbffc33d1f3a96a9788adc5de35809d2548e3 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 5 Aug 2013 22:25:52 +0200 Subject: [PATCH] cwfs: rollback last change the ref qlock is required to keep requests in order for flushes, sorry. --- sys/src/cmd/cwfs/all.h | 1 - sys/src/cmd/cwfs/main.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/sys/src/cmd/cwfs/all.h b/sys/src/cmd/cwfs/all.h index 89a15bea5..4c81ed5fd 100644 --- a/sys/src/cmd/cwfs/all.h +++ b/sys/src/cmd/cwfs/all.h @@ -56,7 +56,6 @@ Timet boottime; Queue* serveq; Queue* raheadq; Rabuf* rabuffree; -QLock reflock; Lock rabuflock; Tlock tlocks[NTLOCK]; Lock tlocklock; diff --git a/sys/src/cmd/cwfs/main.c b/sys/src/cmd/cwfs/main.c index 8f6f2a8e5..8cf0ebc79 100644 --- a/sys/src/cmd/cwfs/main.c +++ b/sys/src/cmd/cwfs/main.c @@ -314,8 +314,6 @@ main(int argc, char **argv) printsizes(); } - qlock(&reflock); - qunlock(&reflock); serveq = newqueue(1000, "9P service"); /* tunable */ raheadq = newqueue(1000, "readahead"); /* tunable */ @@ -451,7 +449,6 @@ serve(void *) 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 @@ serve(void *) if (cp == nil) panic("serve: nil mb->chan"); rlock(&cp->reflock); - qunlock(&reflock); rlock(&mainlock);