From a6e09ef1c209ad765e5db1d2d16e09d4f7ee4e8f Mon Sep 17 00:00:00 2001 From: Jeff Roberson Date: Fri, 30 Apr 2010 04:21:22 +0000 Subject: [PATCH] - 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. --- sbin/tunefs/tunefs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index a10b35daec2..7987620bc59 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -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;