summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/cd.c4
-rw-r--r--sys/scsi/ch.c5
-rw-r--r--sys/scsi/scsi_ioctl.c10
-rw-r--r--sys/scsi/scsiconf.h8
-rw-r--r--sys/scsi/sd.c8
-rw-r--r--sys/scsi/ss.c5
-rw-r--r--sys/scsi/st.c4
-rw-r--r--sys/scsi/uk.c4
8 files changed, 20 insertions, 28 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 649c6c12936..b721935f8b8 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.170 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.171 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -1135,7 +1135,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
error = ENOTTY;
break;
}
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
break;
}
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 29bb2211dee..35e1ce80e63 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ch.c,v 1.37 2009/01/10 21:36:49 beck Exp $ */
+/* $OpenBSD: ch.c,v 1.38 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */
/*
@@ -345,8 +345,7 @@ chioctl(dev, cmd, data, flags, p)
/* Implement prevent/allow? */
default:
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, data,
- flags, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, data, flags);
break;
}
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 00114169853..1af19624821 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_ioctl.c,v 1.41 2010/04/23 01:39:05 dlg Exp $ */
+/* $OpenBSD: scsi_ioctl.c,v 1.42 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/file.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/fcntl.h>
@@ -277,12 +276,9 @@ err:
* Something (e.g. another driver) has called us
* with an sc_link for a target/lun/adapter, and a scsi
* specific ioctl to perform, better try.
- * If user-level type command, we must still be running
- * in the context of the calling process
*/
int
-scsi_do_ioctl(struct scsi_link *sc_link, dev_t dev, u_long cmd, caddr_t addr,
- int flag, struct proc *p)
+scsi_do_ioctl(struct scsi_link *sc_link, u_long cmd, caddr_t addr, int flag)
{
SC_DEBUG(sc_link, SDEV_DB2, ("scsi_do_ioctl(0x%lx)\n", cmd));
@@ -313,7 +309,7 @@ scsi_do_ioctl(struct scsi_link *sc_link, dev_t dev, u_long cmd, caddr_t addr,
default:
if (sc_link->adapter->ioctl)
return ((sc_link->adapter->ioctl)(sc_link, cmd, addr,
- flag, p));
+ flag));
else
return (ENOTTY);
}
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 32c9b9b4be3..05563b69cca 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.h,v 1.126 2010/06/14 10:03:34 thib Exp $ */
+/* $OpenBSD: scsiconf.h,v 1.127 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */
/*
@@ -308,8 +308,7 @@ struct scsi_adapter {
void (*scsi_minphys)(struct buf *, struct scsi_link *);
int (*dev_probe)(struct scsi_link *);
void (*dev_free)(struct scsi_link *);
- int (*ioctl)(struct scsi_link *, u_long, caddr_t, int,
- struct proc *);
+ int (*ioctl)(struct scsi_link *, u_long, caddr_t, int);
};
/*
@@ -590,8 +589,7 @@ void scsi_done(struct scsi_xfer *);
int scsi_scsi_cmd(struct scsi_link *, struct scsi_generic *,
int cmdlen, u_char *data_addr, int datalen, int retries,
int timeout, struct buf *bp, int flags);
-int scsi_do_ioctl(struct scsi_link *, dev_t, u_long, caddr_t,
- int, struct proc *);
+int scsi_do_ioctl(struct scsi_link *, u_long, caddr_t, int);
void sc_print_addr(struct scsi_link *);
int scsi_report_luns(struct scsi_link *, int,
struct scsi_report_luns_data *, u_int32_t, int, int);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 4bb4df1d0a7..25e35c00f1c 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.193 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.194 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -957,7 +957,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
goto exit;
case DIOCINQ:
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
if (error == ENOTTY)
error = sd_ioctl_inquiry(sc,
(struct dk_inquiry *)addr);
@@ -965,7 +965,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
case DIOCGCACHE:
case DIOCSCACHE:
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
if (error == ENOTTY)
error = sd_ioctl_cache(sc, cmd,
(struct dk_cache *)addr);
@@ -976,7 +976,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
error = ENOTTY;
goto exit;
}
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
}
exit:
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c
index 2b3fcaa9752..c48e14c80f4 100644
--- a/sys/scsi/ss.c
+++ b/sys/scsi/ss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ss.c,v 1.73 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: ss.c,v 1.74 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */
/*
@@ -788,8 +788,7 @@ ssioctl(dev, cmd, addr, flag, p)
default:
if (SSMODE(dev) != MODE_CONTROL)
return (ENOTTY);
- return (scsi_do_ioctl(ss->sc_link, dev, cmd, addr,
- flag, p));
+ return (scsi_do_ioctl(ss->sc_link, cmd, addr, flag));
}
return (error);
}
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 203b5e24631..fe5172c061f 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.96 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: st.c,v 1.97 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */
/*
@@ -1357,7 +1357,7 @@ stioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
#endif
default:
- error = scsi_do_ioctl(st->sc_link, dev, cmd, arg, flag, p);
+ error = scsi_do_ioctl(st->sc_link, cmd, arg, flag);
break;
}
goto done;
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index dbf36eb312b..96c9347b387 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uk.c,v 1.13 2007/11/27 16:22:14 martynas Exp $ */
+/* $OpenBSD: uk.c,v 1.14 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $ */
/*
@@ -160,5 +160,5 @@ ukioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
- return (scsi_do_ioctl(uk->sc_link, dev, cmd, addr, flag, p));
+ return (scsi_do_ioctl(uk->sc_link, cmd, addr, flag));
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 01:08:56 +0000