From 95adb9a67cb59756531e669bee91b9e6275ed761 Mon Sep 17 00:00:00 2001 From: pjd Date: Sat, 23 Sep 2006 09:58:50 +0000 Subject: [PATCH] MFC: sys/geom/label/g_label_ufs.c 1.11 Fix detecting of UFS1 label when mediasize%fragsize != 0. Submitted by: Stanislav Sedov PR: kern/84637 Approved by: re (hrs) --- sys/geom/label/g_label_ufs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c index d9aaa3faf1d7..a1801d5e8def 100644 --- a/sys/geom/label/g_label_ufs.c +++ b/sys/geom/label/g_label_ufs.c @@ -78,8 +78,8 @@ g_label_ufs_taste(struct g_consumer *cp, char *label, size_t size) if (fs == NULL) continue; /* Check for magic and make sure things are the right size */ - if (fs->fs_magic == FS_UFS1_MAGIC && - fs->fs_old_size * fs->fs_fsize == (int32_t)pp->mediasize) { + if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_fsize > 0 && + pp->mediasize / fs->fs_fsize == fs->fs_old_size) { /* Valid UFS1. */ } else if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_fsize > 0 && pp->mediasize / fs->fs_fsize == fs->fs_size) {