upas/fs: remove idx semaphore, cannot happen as symcmbox() always called with mailbox locked

3 files changed, 0 insertions, 7 deletions

diff --git a/sys/src/cmd/upas/fs/dat.h b/sys/src/cmd/upas/fs/dat.h
index bd81ad7d3..eaeb3fc0b 100644
--- a/sys/src/cmd/upas/fs/dat.h
+++ b/sys/src/cmd/upas/fs/dat.h
@@ -148,7 +148,6 @@ struct Mcache {
 typedef struct Mailbox Mailbox;
 struct Mailbox {
 	QLock;
-	long	idxsem;		/* abort on concurrent index access */
 	int	refs;
 	Mailbox	*next;
 	int	id;
diff --git a/sys/src/cmd/upas/fs/idx.c b/sys/src/cmd/upas/fs/idx.c
index eebe191c7..b5c3d3280 100644
--- a/sys/src/cmd/upas/fs/idx.c
+++ b/sys/src/cmd/upas/fs/idx.c
@@ -216,7 +216,6 @@ wridxfile(Mailbox *mb)
 	Biobuf b;
 	Dir *d;
 
-	assert(semacquire(&mb->idxsem, 0) != -1);
 	snprint(buf, sizeof buf, "%s.idx", mb->path);
 	iprint("wridxfile %s\n", buf);
 	if((fd = exopen(buf)) == -1){
@@ -224,7 +223,6 @@ wridxfile(Mailbox *mb)
 		if(strcmp(buf, "no creates") != 0)
 		if(strstr(buf, "file system read only") == 0)
 			eprint("wridxfile: %r\n");
-		semrelease(&mb->idxsem, 1);
 		return -1;
 	}
 	seek(fd, 0, 0);
@@ -237,7 +235,6 @@ wridxfile(Mailbox *mb)
 	mb->qid = d->qid;
 	free(d);
 	close(fd);
-	semrelease(&mb->idxsem, 1);
 	return r;
 }
 
@@ -526,10 +523,8 @@ rdidxfile(Mailbox *mb, int doplumb)
 {
 	int r;
 
-	assert(semacquire(&mb->idxsem, 0) > 0);
 	r = rdidxfile0(mb, doplumb);
 	if(r == -1 && mb->idxinvalid)
 		mb->idxinvalid(mb);
-	semrelease(&mb->idxsem, 1);
 	return r;
 }
diff --git a/sys/src/cmd/upas/fs/mbox.c b/sys/src/cmd/upas/fs/mbox.c
index a7d850542..a1e31877b 100644
--- a/sys/src/cmd/upas/fs/mbox.c
+++ b/sys/src/cmd/upas/fs/mbox.c
@@ -176,7 +176,6 @@ newmbox(char *path, char *name, int flags, Mailbox **r)
 		*r = nil;
 	initheaders();
 	mb = emalloc(sizeof *mb);
-	mb->idxsem = 1;
 	mb->flags = flags;
 	strncpy(mb->path, path, sizeof mb->path - 1);
 	p = name;