[src/trunk]: src/sbin/resize_ffs Handle case in grow() where last cylinder gr...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08ac09d97083
branches:  trunk
changeset: 807344:08ac09d97083
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Mon Apr 06 12:38:21 2015 +0000

description:
Handle case in grow() where last cylinder group is too small for ufs2.
Align with code in shrink().

diffstat:

 sbin/resize_ffs/resize_ffs.c |  23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diffs (58 lines):

diff -r b6455fdfb0ba -r 08ac09d97083 sbin/resize_ffs/resize_ffs.c
--- a/sbin/resize_ffs/resize_ffs.c      Mon Apr 06 12:02:08 2015 +0000
+++ b/sbin/resize_ffs/resize_ffs.c      Mon Apr 06 12:38:21 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: resize_ffs.c,v 1.41 2015/03/29 19:33:55 chopps Exp $   */
+/*     $NetBSD: resize_ffs.c,v 1.42 2015/04/06 12:38:21 mlelstv Exp $  */
 /* From sources sent on February 17, 2003 */
 /*-
  * As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: resize_ffs.c,v 1.41 2015/03/29 19:33:55 chopps Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.42 2015/04/06 12:38:21 mlelstv Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
@@ -959,9 +959,13 @@
         * minimal, at most the pre-sb data area. */
        if (cgdmin(newsb, newsb->fs_ncg - 1) > newsb->fs_size) {
                newsb->fs_ncg--;
-               newsb->fs_old_ncyl = newsb->fs_ncg * newsb->fs_old_cpg;
-               newsb->fs_size = (newsb->fs_old_ncyl * newsb->fs_old_spc)
-                   / NSPF(newsb);
+               if (is_ufs2)
+                       newsb->fs_size = newsb->fs_ncg * newsb->fs_fpg;
+               else {
+                       newsb->fs_old_ncyl = newsb->fs_ncg * newsb->fs_old_cpg;
+                       newsb->fs_size = (newsb->fs_old_ncyl *
+                               newsb->fs_old_spc) / NSPF(newsb);
+               }
                printf("Warning: last cylinder group is too small;\n");
                printf("    dropping it.  New size = %lu.\n",
                    (unsigned long int) FFS_FSBTODB(newsb, newsb->fs_size));
@@ -1699,17 +1703,18 @@
                    newsb->fs_old_spc);
                newsb->fs_ncg = howmany(newsb->fs_old_ncyl, newsb->fs_old_cpg);
        }
+
        /* Does the (new) last cg end before the end of its inode area?  See
         * the similar code in grow() for more on this. */
        if (cgdmin(newsb, newsb->fs_ncg - 1) > newsb->fs_size) {
                newsb->fs_ncg--;
-               if (is_ufs2 == 0) {
+               if (is_ufs2)
+                       newsb->fs_size = newsb->fs_ncg * newsb->fs_fpg;
+               else {
                        newsb->fs_old_ncyl = newsb->fs_ncg * newsb->fs_old_cpg;
                        newsb->fs_size = (newsb->fs_old_ncyl *
                            newsb->fs_old_spc) / NSPF(newsb);
-               } else
-                       newsb->fs_size = newsb->fs_ncg * newsb->fs_fpg;
-
+               }
                printf("Warning: last cylinder group is too small;\n");
                printf("    dropping it.  New size = %lu.\n",
                    (unsigned long int) FFS_FSBTODB(newsb, newsb->fs_size));