Module Name: src
Committed By: christos
Date: Wed Feb 10 16:30:01 UTC 2021
Modified Files:
src/sys/dev/scsipi: cd.c sd.c
Log Message:
PR/55986: Ryo Onodera: DK_BUSY must have mask as second argument. Make cd.c
consistent by also using __BIT()
To generate a diff of this commit:
cvs rdiff -u -r1.349 -r1.350 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.330 -r1.331 src/sys/dev/scsipi/sd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.349 src/sys/dev/scsipi/cd.c:1.350
--- src/sys/dev/scsipi/cd.c:1.349 Mon Oct 26 07:39:48 2020
+++ src/sys/dev/scsipi/cd.c Wed Feb 10 11:30:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.349 2020/10/26 11:39:48 mlelstv Exp $ */
+/* $NetBSD: cd.c,v 1.350 2021/02/10 16:30:01 christos Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.349 2020/10/26 11:39:48 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.350 2021/02/10 16:30:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1378,7 +1378,7 @@ cdioctl(dev_t dev, u_long cmd, void *add
XS_CTL_IGNORE_NOT_READY | XS_CTL_IGNORE_MEDIA_CHANGE));
case DIOCEJECT:
if (*(int *)addr == 0) {
- int pmask = 1 << part;
+ int pmask = __BIT(part);
/*
* Don't force eject: check that we are the only
* partition open. If so, unlock it.
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.330 src/sys/dev/scsipi/sd.c:1.331
--- src/sys/dev/scsipi/sd.c:1.330 Fri Sep 25 09:08:00 2020
+++ src/sys/dev/scsipi/sd.c Wed Feb 10 11:30:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.330 2020/09/25 13:08:00 jakllsch Exp $ */
+/* $NetBSD: sd.c,v 1.331 2021/02/10 16:30:01 christos 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.330 2020/09/25 13:08:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.331 2021/02/10 16:30:01 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -954,11 +954,12 @@ sdioctl(dev_t dev, u_long cmd, void *add
if ((periph->periph_flags & PERIPH_REMOVABLE) == 0)
return (ENOTTY);
if (*(int *)addr == 0) {
+ int pmask = __BIT(part);
/*
* Don't force eject: check that we are the only
* partition open. If so, unlock it.
*/
- if (DK_BUSY(dksc, part) == 0) {
+ if (DK_BUSY(dksc, pmask) == 0) {
error = scsipi_prevent(periph, SPAMR_ALLOW,
XS_CTL_IGNORE_NOT_READY);
if (error)
