diff --git a/sys/include/9p.h b/sys/include/9p.h index 68e6e7aaa..17f4e105f 100644 --- a/sys/include/9p.h +++ b/sys/include/9p.h @@ -46,7 +46,6 @@ struct Reqqueue Queueelem; int pid; Req *cur; - jmp_buf flush; }; struct Fid diff --git a/sys/src/lib9p/queue.c b/sys/src/lib9p/queue.c index 307c385fc..4b4bde15f 100644 --- a/sys/src/lib9p/queue.c +++ b/sys/src/lib9p/queue.c @@ -5,18 +5,9 @@ #include <9p.h> static int -_reqqueuenote(void *uregs, char *note) +_reqqueuenote(void *, char *note) { - Reqqueue *q; - - if(strcmp(note, "flush") != 0) - return 0; - q = *threaddata(); - if(q != nil){ - q->cur = nil; - notejmp(uregs, q->flush, 1); - } - return 1; + return strcmp(note, "flush") == 0; } static void @@ -43,10 +34,6 @@ _reqqueueproc(void *v) memset(&r->qu, 0, sizeof(r->qu)); qunlock(&r->lk); q->cur = r; - if(setjmp(q->flush)){ - respond(r, "interrupted"); - continue; - } qunlock(q); f(r); } @@ -98,16 +85,3 @@ reqqueueflush(Reqqueue *q, Req *r) respond(r, "interrupted"); } } - -int -reqqueueflushed(void) -{ - Reqqueue *q; - - q = *threaddata(); - qlock(q); - if(setjmp(q->flush)) - return 1; - qunlock(q); - return 0; -}