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

MFC: sys/geom/label/g_label_ufs.c 1.11

Browse Source 
Fix detecting of UFS1 label when mediasize%fragsize != 0.

Submitted by:	Stanislav Sedov
PR:		kern/84637
Approved by:	re (hrs)
This commit is contained in:
pjd 2006-09-23 09:58:50 +00:00
parent 150bbdab97
commit 95adb9a67c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/geom/label/g_label_ufs.c
View File

@ -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) {