d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When growing a filesystem, don't leave unused space at the end

Browse Source 
if there is not enough room for a full cylinder group.

Reviewed by:	mckusick@
This commit is contained in:
trasz 2012-12-16 14:37:25 +00:00
parent a198747e4a
commit 1fdcf9e7be
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/growfs/growfs.c
View File

@ -1611,17 +1611,20 @@ main(int argc, char **argv)
}
sblock.fs_ncg = howmany(sblock.fs_size, sblock.fs_fpg);
/*
* Allocate last cylinder group only if there is enough room
* for at least one data block.
*/
if (sblock.fs_size % sblock.fs_fpg != 0 &&
sblock.fs_size % sblock.fs_fpg < cgdmin(&sblock, sblock.fs_ncg)) {
/*
* The space in the new last cylinder group is too small,
* so revert back.
*/
sblock.fs_size <= cgdmin(&sblock, sblock.fs_ncg - 1)) {
humanize_number(oldsizebuf, sizeof(oldsizebuf),
(sblock.fs_size % sblock.fs_fpg) * sblock.fs_fsize,
"B", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
warnx("no room to allocate last cylinder group; "
"leaving %s unused", oldsizebuf);
sblock.fs_ncg--;
if (sblock.fs_magic == FS_UFS1_MAGIC)
sblock.fs_old_ncyl = sblock.fs_ncg * sblock.fs_old_cpg;
printf("Warning: %jd sector(s) cannot be allocated.\n",
(intmax_t)fsbtodb(&sblock, sblock.fs_size % sblock.fs_fpg));
sblock.fs_size = sblock.fs_ncg * sblock.fs_fpg;
}