summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>1999-12-06 06:50:12 +0000
committerArtur Grabowski <art@cvs.openbsd.org>1999-12-06 06:50:12 +0000
commit705172fc53e9986a0c286c5db9735afeddc125ea (patch)
tree281ced1ac21f031e0e307dc0d0995df471c3c258
parented0ef13119b0600b79a09ecaab7b6e8a725d4820 (diff)
#if 0 some broken unreached code.
-rw-r--r--sys/ufs/ffs/ffs_alloc.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 4017741f978..d7895724a07 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_alloc.c,v 1.16 1999/06/01 01:48:52 millert Exp $ */
+/* $OpenBSD: ffs_alloc.c,v 1.17 1999/12/06 06:50:11 art Exp $ */
/* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */
/*
@@ -936,10 +936,17 @@ ffs_alloccg(ip, cg, bpref, size)
return (bno);
}
bno = ffs_mapsearch(fs, cgp, bpref, allocsiz);
+#if 0
+ /*
+ * XXX ffs_mapsearch will panic instead of return -1, and we can't
+ * XXX return NULL as a daddr_t anyway.
+ */
if (bno < 0) {
brelse(bp);
+ /* XXX - NULL as a daddr_t ??? */
return (NULL);
}
+#endif
for (i = 0; i < frags; i++)
clrbit(cg_blksfree(cgp), bno + i);
cgp->cg_cs.cs_nffree -= frags;
@@ -1059,8 +1066,14 @@ norot:
* available one in this cylinder group.
*/
bno = ffs_mapsearch(fs, cgp, bpref, (int)fs->fs_frag);
+#if 0
+ /*
+ * XXX ffs_mapsearch will panic instead of return -1, and we can't
+ * XXX return NULL as a daddr_t anyway.
+ */
if (bno < 0)
- return (NULL);
+ return (NULL); /* XXX - NULL as a daddr_t ?? */
+#endif
cgp->cg_rotor = bno;
gotit:
blkno = fragstoblks(fs, bno);