summaryrefslogtreecommitdiff
path: root/usr/src/cmd/backup
diff options
context:
space:
mode:
authorvsakar <none@none>2005-10-26 06:21:57 -0700
committervsakar <none@none>2005-10-26 06:21:57 -0700
commit6451fdbca2f79129a3a09d2fe3f6dd4d062bebff (patch)
tree775d7811f423315fa9c6dd3bf60e53e1c19a74c3 /usr/src/cmd/backup
parent61cb17bdcebae6d20d4f63d082e223cedf5c379b (diff)
downloadillumos-joyent-6451fdbca2f79129a3a09d2fe3f6dd4d062bebff.tar.gz
PSARC 2005/517 UFS_EFISTYLE4NONEFI_VERSION_2
4471706 newfs should be able to cope with larger disks and their corresponding sector/track values 6184783 growfs fails to expand multi-terabyte-ready UFS to > 1TB
Diffstat (limited to 'usr/src/cmd/backup')
-rw-r--r--usr/src/cmd/backup/dump/dumpmain.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/usr/src/cmd/backup/dump/dumpmain.c b/usr/src/cmd/backup/dump/dumpmain.c
index f6671313f5..1b288a8246 100644
--- a/usr/src/cmd/backup/dump/dumpmain.c
+++ b/usr/src/cmd/backup/dump/dumpmain.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1998, 2000-2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -693,6 +693,15 @@ main(argc, argv)
/*NOTREACHED*/
}
+ if (sblock->fs_magic == FS_MAGIC &&
+ (sblock->fs_version != UFS_EFISTYLE4NONEFI_VERSION_2 &&
+ sblock->fs_version != UFS_VERSION_MIN)) {
+ msg(gettext("Unrecognized UFS version: %d\n"),
+ sblock->fs_version);
+ dumpabort();
+ /*NOTREACHED*/
+ }
+
if (sblock->fs_magic == MTB_UFS_MAGIC &&
(sblock->fs_version < MTB_UFS_VERSION_MIN ||
sblock->fs_version > MTB_UFS_VERSION_1)) {
@@ -730,6 +739,15 @@ restart:
/*NOTREACHED*/
}
+ if (sblock->fs_magic == FS_MAGIC &&
+ (sblock->fs_version != UFS_EFISTYLE4NONEFI_VERSION_2 &&
+ sblock->fs_version != UFS_VERSION_MIN)) {
+ msg(gettext("Unrecognized UFS version: %d\n"),
+ sblock->fs_version);
+ dumpabort();
+ /*NOTREACHED*/
+ }
+
if (sblock->fs_magic == MTB_UFS_MAGIC &&
(sblock->fs_version < MTB_UFS_VERSION_MIN ||
sblock->fs_version > MTB_UFS_VERSION_1)) {