summaryrefslogtreecommitdiffstats
path: root/sys/dev/slice
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-06-07 19:40:41 +0000
committerdfr <dfr@FreeBSD.org>1998-06-07 19:40:41 +0000
commit7926e3cc5bd26a7c5a3e810760d4e3d3fdeccb73 (patch)
treef0e8d5a91d577f1997339e9d1a59028a4c502cc1 /sys/dev/slice
parente54858d021231686d3d285e47a682e7c9cfe6280 (diff)
downloadFreeBSD-src-7926e3cc5bd26a7c5a3e810760d4e3d3fdeccb73.zip
FreeBSD-src-7926e3cc5bd26a7c5a3e810760d4e3d3fdeccb73.tar.gz
Fix some more ioctls which I missed becausese they were hidden by options
which were not in LINT.
Diffstat (limited to 'sys/dev/slice')
-rw-r--r--sys/dev/slice/disklabel.c6
-rw-r--r--sys/dev/slice/mbr.c4
-rw-r--r--sys/dev/slice/slice.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/slice/disklabel.c b/sys/dev/slice/disklabel.c
index 31bd6d1..57d3c2a 100644
--- a/sys/dev/slice/disklabel.c
+++ b/sys/dev/slice/disklabel.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: disklabel.c,v 1.4 1998/05/06 22:14:31 julian Exp $
+ * $Id: disklabel.c,v 1.5 1998/05/06 23:32:47 julian Exp $
*/
#define BAD144
@@ -778,7 +778,7 @@ RR;
#endif /* 0 */
static int
-dkl_ioctl(void *private, int cmd, caddr_t addr, int flag, struct proc * p)
+dkl_ioctl(void *private, u_long cmd, caddr_t addr, int flag, struct proc * p)
{
register struct private_data *pd;
struct subdev *sdp;
@@ -857,7 +857,7 @@ static struct disklabel static_label;
* knows about disklabels.
*/
int
-dkl_dummy_ioctl(struct slice *slice, int cmd, caddr_t addr,
+dkl_dummy_ioctl(struct slice *slice, u_long cmd, caddr_t addr,
int flag, struct proc * p)
{
struct disklabel *lp = &static_label;
diff --git a/sys/dev/slice/mbr.c b/sys/dev/slice/mbr.c
index 8efd3f3..f462887 100644
--- a/sys/dev/slice/mbr.c
+++ b/sys/dev/slice/mbr.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mbr.c,v 1.4 1998/05/06 22:14:32 julian Exp $
+ * $Id: mbr.c,v 1.5 1998/05/06 23:32:48 julian Exp $
*/
#include <sys/param.h>
@@ -807,7 +807,7 @@ RR;
#endif /* 0 */
static int
-mbr_ioctl(void *private, int cmd, caddr_t addr, int flag, struct proc * p)
+mbr_ioctl(void *private, u_long cmd, caddr_t addr, int flag, struct proc * p)
{
register struct private_data *pd;
struct subdev *sdp;
diff --git a/sys/dev/slice/slice.h b/sys/dev/slice/slice.h
index ee7cd36..3d7eabd 100644
--- a/sys/dev/slice/slice.h
+++ b/sys/dev/slice/slice.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: slice.h,v 1.1 1998/04/19 23:31:10 julian Exp $
+ * $Id: slice.h,v 1.2 1998/05/06 22:14:33 julian Exp $
*/
typedef struct slice_handler *sh_p;
@@ -114,7 +114,7 @@ struct slice {
* prototypes for slice methods
*/
typedef void sl_h_IO_req_t(void *private, struct buf * buf);
-typedef int sl_h_ioctl_t(void *private, int cmd, caddr_t data,
+typedef int sl_h_ioctl_t(void *private, u_long cmd, caddr_t data,
int fflag, struct proc * p);
typedef int sl_h_constructor_t(sl_p slice);
typedef int sl_h_open_t(void *private, int flags, int mode, struct proc * p);
@@ -184,7 +184,7 @@ int dkl_geom_hack(struct slice * slice, struct ide_geom *geom);
* Lives in disklabel.c because that's where everyhting is in scope,
* but is used in slice_device.c. XXX hack.
*/
-int dkl_dummy_ioctl(struct slice *slice, int cmd, caddr_t addr,
+int dkl_dummy_ioctl(struct slice *slice, u_long cmd, caddr_t addr,
int flag, struct proc * p);
/*
OpenPOWER on IntegriCloud