diff options
| author | mav <mav@FreeBSD.org> | 2017-01-19 11:17:09 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-01-19 11:17:09 +0000 |
| commit | c7858d59b15d0f847f40a9b73a6412682cc287e2 (patch) | |
| tree | dacc9afcfda359f212ee8cb25b3d2149bffd49d2 /sys/geom/geom_disk.c | |
| parent | caeb9d2d92a84de6e03f7375c902dcf2d532f61b (diff) | |
| download | FreeBSD-src-c7858d59b15d0f847f40a9b73a6412682cc287e2.zip FreeBSD-src-c7858d59b15d0f847f40a9b73a6412682cc287e2.tar.gz | |
MFC r311971: Report random flash storage as non-rotating to GEOM_DISK.
While doing it, introduce respective constants in geom_disk.h.
Diffstat (limited to 'sys/geom/geom_disk.c')
| -rw-r--r-- | sys/geom/geom_disk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index a0a357f..18402c4 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -589,12 +589,12 @@ g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g * special cases, and there's also a valid range. */ sbuf_printf(sb, "%s<rotationrate>", indent); - if (dp->d_rotation_rate == 0) /* Old drives don't */ - sbuf_printf(sb, "unknown"); /* report RPM. */ - else if (dp->d_rotation_rate == 1) /* Since 0 is used */ - sbuf_printf(sb, "0"); /* above, SSDs use 1. */ - else if ((dp->d_rotation_rate >= 0x041) && - (dp->d_rotation_rate <= 0xfffe)) + if (dp->d_rotation_rate == DISK_RR_UNKNOWN) /* Old drives */ + sbuf_printf(sb, "unknown"); /* don't report RPM. */ + else if (dp->d_rotation_rate == DISK_RR_NON_ROTATING) + sbuf_printf(sb, "0"); + else if ((dp->d_rotation_rate >= DISK_RR_MIN) && + (dp->d_rotation_rate <= DISK_RR_MAX)) sbuf_printf(sb, "%u", dp->d_rotation_rate); else sbuf_printf(sb, "invalid"); |
