HAMMER Utility - Allow expanding root filesystems again

This reverts commit e3102897c486b844e6a59e419e7e98a0d1ca3246, because
as of commit 104cb849cad1c21c8929f73d7654e16c4fb8a268, multi-volume
HAMMER root-mounts should work.

Please note that "hammer expand" is still considered EXPERIMENTAL.

diff --git a/sbin/hammer/cmd_expand.c b/sbin/hammer/cmd_expand.c
index d327d81..c093449 100644 (file)
--- a/sbin/hammer/cmd_expand.c
+++ b/sbin/hammer/cmd_expand.c
@@ -50,7 +50,6 @@ void
 hammer_cmd_expand(char **av, int ac)
 {
        struct hammer_ioc_expand expand;
-       struct statfs sfs;
        int fd;
 
        if (ac != 2)
@@ -63,23 +62,6 @@ hammer_cmd_expand(char **av, int ac)
        }
 
        /*
-        * Make sure we aren't trying to expand the root filesystem.  The
-        * kernel can't handle multi-volume root mounts.
-        */
-       if (fstatfs(fd, &sfs) < 0) {
-               fprintf(stderr, "hammer expand: statvfs failed on %s: %s\n",
-                       av[0], strerror(errno));
-               exit(1);
-       }
-       if (strcmp(sfs.f_mntonname, "/") == 0 || sfs.f_mntonname[0] == 0) {
-               fprintf(stderr,
-                       "hammer expand: Refused attempt to expand root fs.\n"
-                       "The kernel is unable to boot from multi-volume\n"
-                       "HAMMER root filesystems.\n");
-               exit(1);
-       }
-
-       /*
         * Expansion ioctl
         */
        bzero(&expand, sizeof(expand));

diff --git a/sbin/hammer/hammer.8 b/sbin/hammer/hammer.8
index e8dbf71..0a98cf4 100644 (file)
--- a/sbin/hammer/hammer.8
+++ b/sbin/hammer/hammer.8
@@ -505,10 +505,6 @@ colon-separated to
 .Pa /etc/fstab
 and
 .Xr mount_hammer 8 .
-.Pp
-Any attempt to expand the root filesystem will fail with an error.
-.Dx
-is currently unable to boot from a multi-volume root.
 .\" ==== snapshot ====
 .It Cm snapshot Oo Ar filesystem Oc Ar snapshot-dir
 .It Cm snapshot Ar filesystem Ar snapshot-dir Op Ar note