Backed out changeset 2737b9af622b

not what I wanted to commit.

1 files changed, 5 insertions, 10 deletions

diff --git a/sys/src/cmd/dossrv/dosfs.c b/sys/src/cmd/dossrv/dosfs.c
index 499551070..4a644fca5 100644
--- a/sys/src/cmd/dossrv/dosfs.c
+++ b/sys/src/cmd/dossrv/dosfs.c
@@ -550,7 +550,7 @@ rclunk(void)
 /*
  * wipe out a dos directory entry
  */
-static int
+static void
 doremove(Xfs *xf, Dosptr *dp)
 {
 	Iosect *p;
@@ -565,8 +565,6 @@ doremove(Xfs *xf, Dosptr *dp)
 	}
 	if(prevdo < 0 && dp->prevaddr != -1){
 		p = getsect(xf, dp->prevaddr);
-		if(p == nil)
-			return -1;
 		for(prevdo = ((Dosbpb*)xf->ptr)->sectsize-DOSDIRSIZE; prevdo >= 0; prevdo -= DOSDIRSIZE){
 			if(p->iobuf[prevdo+11] != 0xf)
 				break;
@@ -574,8 +572,7 @@ doremove(Xfs *xf, Dosptr *dp)
 			p->flags |= BMOD;
 		}
 		putsect(p);
-	}
-	return 0;		
+	}		
 }
 
 void
@@ -604,7 +601,8 @@ rremove(void)
 	 * or it's a read only file in the root directory
 	 */
 	parp = getsect(f->xf, dp->paddr);
-	if(parp == nil || getfile(f) < 0){
+	if(parp == nil
+	|| getfile(f) < 0){
 		errno = Eio;
 		goto out;
 	}
@@ -619,10 +617,7 @@ rremove(void)
 		errno = Eio;
 		goto out;
 	}
-	if(doremove(f->xf, f->ptr) == -1){
-		errno = Eio;
-		goto out;
-	}
+	doremove(f->xf, f->ptr);
 	if(!isroot(dp->paddr)){
 		puttime(pard, 0);
 		parp->flags |= BMOD;