svn commit: r207421 - head/sbin/tunefs

[Jeff Roberson]

Author: jeff
Date: Fri Apr 30 04:21:22 2010
New Revision: 207421
URL: http://svn.freebsd.org/changeset/base/207421

Log:
   - Use the path to the filesystem mountpoint to look up the statfs
     structure so that we correctly reload.  Note that tunefs doesn't
     properly detect the need to reload if the disk device is specified
     for a read-only mounted filesystem.
   - Lessen the contiguity requirement for the journal so that it is more
     likely to succeed.

Modified:
  head/sbin/tunefs/tunefs.c

Modified: head/sbin/tunefs/tunefs.c
==============================================================================
--- head/sbin/tunefs/tunefs.c	Fri Apr 30 03:35:05 2010	(r207420)
+++ head/sbin/tunefs/tunefs.c	Fri Apr 30 04:21:22 2010	(r207421)
@@ -280,9 +280,9 @@ main(int argc, char *argv[])
 	if (ufs_disk_fillout(&disk, special) == -1)
 		goto err;
 	if (disk.d_name != special) {
-		special = disk.d_name;
-		if (statfs(special, &stfs) == 0 &&
-		    strcmp(special, stfs.f_mntonname) == 0)
+		if (statfs(special, &stfs) != 0)
+			warn("Can't stat %s", special);
+		if (strcmp(special, stfs.f_mntonname) == 0)
 			active = 1;
 	}
 
@@ -546,7 +546,7 @@ journal_balloc(void)
 			 * Try to minimize fragmentation by requiring a minimum
 			 * number of blocks present.
 			 */
-			if (cgp->cg_cs.cs_nbfree > blocks / 8)
+			if (cgp->cg_cs.cs_nbfree > 128 * 1024 * 1024)
 				break;
 			if (contig == 0 && cgp->cg_cs.cs_nbfree)
 				break;