summaryrefslogtreecommitdiff
path: root/sys/dev/scsipi
diff options
context:
space:
mode:
authorjakllsch <jakllsch@NetBSD.org>2022-01-27 18:44:49 +0000
committerjakllsch <jakllsch@NetBSD.org>2022-01-27 18:44:49 +0000
commit0ec973284bf8795f6dfa17bccf0ea368ddec04a6 (patch)
tree6b015b9a22ca1993d67bb631fe1f2d1effe0b5c6 /sys/dev/scsipi
parente7f1a4771d257fca0ed6a5d38bf22ce1a96c6d90 (diff)
use powerof2() in sd_validate_blksize()
Diffstat (limited to 'sys/dev/scsipi')
-rw-r--r--sys/dev/scsipi/sd.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 7bd0d12c070..dd7fb3c4807 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.332 2021/05/30 06:46:46 dholland Exp $ */
+/* $NetBSD: sd.c,v 1.333 2022/01/27 18:44:49 jakllsch Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.332 2021/05/30 06:46:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.333 2022/01/27 18:44:49 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -1311,19 +1311,14 @@ static int
sd_validate_blksize(struct scsipi_periph *periph, int len)
{
- switch (len) {
- case 256:
- case 512:
- case 1024:
- case 2048:
- case 4096:
+ if (len >= 256 && powerof2(len) && len <= 4096) {
return 1;
}
if (periph) {
scsipi_printaddr(periph);
printf("%s sector size: 0x%x. Defaulting to %d bytes.\n",
- (len ^ (1 << (ffs(len) - 1))) ?
+ !powerof2(len) ?
"preposterous" : "unsupported",
len, SD_DEFAULT_BLKSIZE);
}