Tue Jan 17 16:27:19 2012 UTC ()

Use an even smaller segment size when creating a very small filesystem.
This allows the lfs_renamerace_dirs case of the t_renamerace test to
fail correctly, rather than with a bogus "file system full" error as it
has since rev 1.135 of sys/ufs/lfs/lfs.h.


(perseant)

diff -r1.16 -r1.17 src/sbin/newfs_lfs/make_lfs.c

--- src/sbin/newfs_lfs/make_lfs.c 2010/02/16 23:20:30	1.16
+++ src/sbin/newfs_lfs/make_lfs.c 2012/01/17 16:27:19	1.17

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make_lfs.c,v 1.16 2010/02/16 23:20:30 mlelstv Exp $	*/
+/*	$NetBSD: make_lfs.c,v 1.17 2012/01/17 16:27:19 perseant Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,27 +52,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)lfs.c	8.5 (Berkeley) 5/24/95";
 #else
-__RCSID("$NetBSD: make_lfs.c,v 1.16 2010/02/16 23:20:30 mlelstv Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.17 2012/01/17 16:27:19 perseant Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 @@ -478,48 +478,50 @@ make_lfs(int devfd, uint secsize, struct
 		fs->lfs_minfreeseg = fs->lfs_nseg / DFL_MIN_FREE_SEGS;
 	else
 		fs->lfs_minfreeseg = minfreeseg;
 	if (fs->lfs_minfreeseg < MIN_FREE_SEGS)
 		fs->lfs_minfreeseg = MIN_FREE_SEGS;
 	if (resvseg == 0)
 		fs->lfs_resvseg = fs->lfs_minfreeseg / 2 + 1;
 	else
 		fs->lfs_resvseg = resvseg;
 	if (fs->lfs_resvseg < MIN_RESV_SEGS)
 		fs->lfs_resvseg = MIN_RESV_SEGS;
-	if(fs->lfs_nseg < fs->lfs_minfreeseg + 1
+	if(fs->lfs_nseg < (3 * CM_MAG_NUM * fs->lfs_minfreeseg) / CM_MAG_DEN + 1
 	   || fs->lfs_nseg < LFS_MIN_SBINTERVAL + 1)
+	{
 		if(seg_size == 0 && ssize > (bsize<<1)) {
 			if(!warned_segtoobig) {
 				fprintf(stderr,"Segment size %d is too large; "
 					"trying smaller sizes.\n", ssize);
 				if (ssize == (bsize << 16)) {
 					fprintf(stderr, "(Did you perhaps "
 						"accidentally leave \"16\" "
 						"in the disklabel's sgs "
 						"field?)\n");
+				}
+			}
 			++warned_segtoobig;
 			ssize >>= 1;
 			goto tryagain;
+		}
 		fatal("Could not allocate enough segments with segment "
 			"size %d and block size %d;\nplease decrease the "
 			"segment size.\n", ssize, fs->lfs_bsize);
+	}
 	if(warned_segtoobig)
 		fprintf(stderr,"Using segment size %d.\n", ssize);
 	/*
 	 * Now that we've determined what we're going to do, announce it
 	 * to the user.
 	 */
         printf("Creating a version %d LFS", fs->lfs_version);
         if (fs->lfs_version > 1)
                 printf(" with roll-forward ident 0x%x", fs->lfs_ident);
         printf("\n");
         fssize = (double)fs->lfs_nseg;
         fssize *= (double)ssize;
         fssize /= 1048576.0;
         printf("%.1fMB in %d segments of size %d\n", fssize,