6 files changed, 15 insertions, 14 deletions

diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index b6544d81c9749..50a59c36914ee 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -285,7 +285,7 @@ ata_resume(device_t dev)
 }
 
 static int
-ataioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
+ataioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct thread *td)
 {
     struct ata_cmd *iocmd = (struct ata_cmd *)addr;
     device_t device;
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 59aa2500b8674..7e5470aae9d4a 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -252,7 +252,7 @@ ad_detach(struct ad_softc *adp, int flush)
 }
 
 static int
-adopen(dev_t dev, int flags, int fmt, struct proc *p)
+adopen(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct ad_softc *adp = dev->si_drv1;
 
@@ -262,7 +262,7 @@ adopen(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int
-adclose(dev_t dev, int flags, int fmt, struct proc *p)
+adclose(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct ad_softc *adp = dev->si_drv1;
 
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index 161d6b885ff6e..121110fffde80 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -137,7 +137,7 @@ ar_attach(struct ar_softc *raid)
 }
 
 static int
-aropen(dev_t dev, int flags, int fmt, struct proc *p)
+aropen(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct ar_softc *rdp = dev->si_drv1;
     struct disklabel *dl;
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 31d86e908a063..f69e7e7aac112 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -33,6 +33,7 @@
 #include <sys/ata.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/disklabel.h>
@@ -499,7 +500,7 @@ msf2lba(u_int8_t m, u_int8_t s, u_int8_t f)
 }
 
 static int
-acdopen(dev_t dev, int flags, int fmt, struct proc *p)
+acdopen(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct acd_softc *cdp = dev->si_drv1;
     
@@ -523,7 +524,7 @@ acdopen(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int 
-acdclose(dev_t dev, int flags, int fmt, struct proc *p)
+acdclose(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct acd_softc *cdp = dev->si_drv1;
     
@@ -542,7 +543,7 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int 
-acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
+acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 {
     struct acd_softc *cdp = dev->si_drv1;
     int error = 0;
@@ -595,7 +596,7 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 	break;
 
     case CDIOCRESET:
-	error = suser(p);
+	error = suser(td->td_proc);
 	if (error)
 	    break;
 	error = atapi_test_ready(cdp->atp);
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index a419d2b1353df..ba47781b0f326 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -239,7 +239,7 @@ afd_describe(struct afd_softc *fdp)
 }
 
 static int
-afdopen(dev_t dev, int flags, int fmt, struct proc *p)
+afdopen(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct afd_softc *fdp = dev->si_drv1;
     struct disklabel *label = &fdp->disk.d_label;
@@ -266,7 +266,7 @@ afdopen(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int 
-afdclose(dev_t dev, int flags, int fmt, struct proc *p)
+afdclose(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct afd_softc *fdp = dev->si_drv1;
 
@@ -276,7 +276,7 @@ afdclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int 
-afdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+afdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
     struct afd_softc *fdp = dev->si_drv1;
 
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 98114c3fd4246..cb8b8938fac6b 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -255,7 +255,7 @@ ast_describe(struct ast_softc *stp)
 }
 
 static int
-astopen(dev_t dev, int flags, int fmt, struct proc *p)
+astopen(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct ast_softc *stp = dev->si_drv1;
 
@@ -281,7 +281,7 @@ astopen(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int 
-astclose(dev_t dev, int flags, int fmt, struct proc *p)
+astclose(dev_t dev, int flags, int fmt, struct thread *td)
 {
     struct ast_softc *stp = dev->si_drv1;
 
@@ -310,7 +310,7 @@ astclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int 
-astioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+astioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
     struct ast_softc *stp = dev->si_drv1;
     int error = 0;