summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-02-21 21:10:55 +0000
committerphk <phk@FreeBSD.org>2004-02-21 21:10:55 +0000
commitad925439e08646e188eb1c0e0be355f0685c8739 (patch)
tree0896a7d99c90ad922a1e4b41f052d155256cb97e /sys/cam
parentd68e8ba04cb070f349043edccaafae5facffab48 (diff)
downloadFreeBSD-src-ad925439e08646e188eb1c0e0be355f0685c8739.zip
FreeBSD-src-ad925439e08646e188eb1c0e0be355f0685c8739.tar.gz
Device megapatch 4/6:
Introduce d_version field in struct cdevsw, this must always be initialized to D_VERSION. Flip sense of D_NOGIANT flag to D_NEEDGIANT, this involves removing four D_NOGIANT flags and adding 145 D_NEEDGIANT flags.
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/cam_xpt.c2
-rw-r--r--sys/cam/scsi/scsi_ch.c2
-rw-r--r--sys/cam/scsi/scsi_pass.c2
-rw-r--r--sys/cam/scsi/scsi_pt.c2
-rw-r--r--sys/cam/scsi/scsi_sa.c3
-rw-r--r--sys/cam/scsi/scsi_ses.c2
-rw-r--r--sys/cam/scsi/scsi_target.c2
7 files changed, 14 insertions, 1 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 03eaf54..7e3bfce 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -636,6 +636,8 @@ static d_close_t xptclose;
static d_ioctl_t xptioctl;
static struct cdevsw xpt_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = xptopen,
.d_close = xptclose,
.d_ioctl = xptioctl,
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index a9ed373..7caaf0a 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -212,6 +212,8 @@ static struct periph_driver chdriver =
PERIPHDRIVER_DECLARE(ch, chdriver);
static struct cdevsw ch_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = chopen,
.d_close = chclose,
.d_ioctl = chioctl,
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 13c1017..67c73d9 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -105,6 +105,8 @@ static struct periph_driver passdriver =
PERIPHDRIVER_DECLARE(pass, passdriver);
static struct cdevsw pass_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = passopen,
.d_close = passclose,
.d_ioctl = passioctl,
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index cc3afa6c..9e053f8 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -118,6 +118,8 @@ PERIPHDRIVER_DECLARE(pt, ptdriver);
static struct cdevsw pt_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = ptopen,
.d_close = ptclose,
.d_read = physread,
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index c41e416..b1fbd22 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -425,6 +425,7 @@ PERIPHDRIVER_DECLARE(sa, sadriver);
static struct cdevsw sa_cdevsw = {
+ .d_version = D_VERSION,
.d_open = saopen,
.d_close = saclose,
.d_read = physread,
@@ -432,7 +433,7 @@ static struct cdevsw sa_cdevsw = {
.d_ioctl = saioctl,
.d_strategy = sastrategy,
.d_name = "sa",
- .d_flags = D_TAPE,
+ .d_flags = D_TAPE | D_NEEDGIANT,
};
static int
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 8f594ae..a0a2f14 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -175,10 +175,12 @@ static struct periph_driver sesdriver = {
PERIPHDRIVER_DECLARE(ses, sesdriver);
static struct cdevsw ses_cdevsw = {
+ .d_version = D_VERSION,
.d_open = sesopen,
.d_close = sesclose,
.d_ioctl = sesioctl,
.d_name = "ses",
+ .d_flags = D_NEEDGIANT,
};
static void
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 7e0d28f..9310efe 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -105,6 +105,8 @@ static struct filterops targread_filtops =
{ 1, NULL, targreadfiltdetach, targreadfilt };
static struct cdevsw targ_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = targopen,
.d_close = targclose,
.d_read = targread,
OpenPOWER on IntegriCloud