diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:36:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:44 -0500 |
commit | cc5ef55fd0d81f70b0afc86817aa1d305fd6aeaa (patch) | |
tree | 9efad23b8098207a5fa944476798591c270c5910 /drivers/char/drm | |
parent | d817be9ca8766b521f6195f57281284c5ab0ff4c (diff) |
[PATCH] struct path: convert drm
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r-- | drivers/char/drm/drm_ioc32.c | 56 | ||||
-rw-r--r-- | drivers/char/drm/i915_ioc32.c | 12 | ||||
-rw-r--r-- | drivers/char/drm/mga_ioc32.c | 8 | ||||
-rw-r--r-- | drivers/char/drm/r128_ioc32.c | 10 | ||||
-rw-r--r-- | drivers/char/drm/radeon_ioc32.c | 20 |
5 files changed, 53 insertions, 53 deletions
diff --git a/drivers/char/drm/drm_ioc32.c b/drivers/char/drm/drm_ioc32.c index d4f87452008..fafeb34f89d 100644 --- a/drivers/char/drm/drm_ioc32.c +++ b/drivers/char/drm/drm_ioc32.c | |||
@@ -102,7 +102,7 @@ static int compat_drm_version(struct file *file, unsigned int cmd, | |||
102 | &version->desc)) | 102 | &version->desc)) |
103 | return -EFAULT; | 103 | return -EFAULT; |
104 | 104 | ||
105 | err = drm_ioctl(file->f_dentry->d_inode, file, | 105 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
106 | DRM_IOCTL_VERSION, (unsigned long)version); | 106 | DRM_IOCTL_VERSION, (unsigned long)version); |
107 | if (err) | 107 | if (err) |
108 | return err; | 108 | return err; |
@@ -143,7 +143,7 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd, | |||
143 | &u->unique)) | 143 | &u->unique)) |
144 | return -EFAULT; | 144 | return -EFAULT; |
145 | 145 | ||
146 | err = drm_ioctl(file->f_dentry->d_inode, file, | 146 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
147 | DRM_IOCTL_GET_UNIQUE, (unsigned long)u); | 147 | DRM_IOCTL_GET_UNIQUE, (unsigned long)u); |
148 | if (err) | 148 | if (err) |
149 | return err; | 149 | return err; |
@@ -172,7 +172,7 @@ static int compat_drm_setunique(struct file *file, unsigned int cmd, | |||
172 | &u->unique)) | 172 | &u->unique)) |
173 | return -EFAULT; | 173 | return -EFAULT; |
174 | 174 | ||
175 | return drm_ioctl(file->f_dentry->d_inode, file, | 175 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
176 | DRM_IOCTL_SET_UNIQUE, (unsigned long)u); | 176 | DRM_IOCTL_SET_UNIQUE, (unsigned long)u); |
177 | } | 177 | } |
178 | 178 | ||
@@ -203,7 +203,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd, | |||
203 | if (__put_user(idx, &map->offset)) | 203 | if (__put_user(idx, &map->offset)) |
204 | return -EFAULT; | 204 | return -EFAULT; |
205 | 205 | ||
206 | err = drm_ioctl(file->f_dentry->d_inode, file, | 206 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
207 | DRM_IOCTL_GET_MAP, (unsigned long)map); | 207 | DRM_IOCTL_GET_MAP, (unsigned long)map); |
208 | if (err) | 208 | if (err) |
209 | return err; | 209 | return err; |
@@ -244,7 +244,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, | |||
244 | || __put_user(m32.flags, &map->flags)) | 244 | || __put_user(m32.flags, &map->flags)) |
245 | return -EFAULT; | 245 | return -EFAULT; |
246 | 246 | ||
247 | err = drm_ioctl(file->f_dentry->d_inode, file, | 247 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
248 | DRM_IOCTL_ADD_MAP, (unsigned long)map); | 248 | DRM_IOCTL_ADD_MAP, (unsigned long)map); |
249 | if (err) | 249 | if (err) |
250 | return err; | 250 | return err; |
@@ -282,7 +282,7 @@ static int compat_drm_rmmap(struct file *file, unsigned int cmd, | |||
282 | if (__put_user((void *)(unsigned long)handle, &map->handle)) | 282 | if (__put_user((void *)(unsigned long)handle, &map->handle)) |
283 | return -EFAULT; | 283 | return -EFAULT; |
284 | 284 | ||
285 | return drm_ioctl(file->f_dentry->d_inode, file, | 285 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
286 | DRM_IOCTL_RM_MAP, (unsigned long)map); | 286 | DRM_IOCTL_RM_MAP, (unsigned long)map); |
287 | } | 287 | } |
288 | 288 | ||
@@ -312,7 +312,7 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd, | |||
312 | if (__put_user(idx, &client->idx)) | 312 | if (__put_user(idx, &client->idx)) |
313 | return -EFAULT; | 313 | return -EFAULT; |
314 | 314 | ||
315 | err = drm_ioctl(file->f_dentry->d_inode, file, | 315 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
316 | DRM_IOCTL_GET_CLIENT, (unsigned long)client); | 316 | DRM_IOCTL_GET_CLIENT, (unsigned long)client); |
317 | if (err) | 317 | if (err) |
318 | return err; | 318 | return err; |
@@ -349,7 +349,7 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd, | |||
349 | if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats))) | 349 | if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats))) |
350 | return -EFAULT; | 350 | return -EFAULT; |
351 | 351 | ||
352 | err = drm_ioctl(file->f_dentry->d_inode, file, | 352 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
353 | DRM_IOCTL_GET_STATS, (unsigned long)stats); | 353 | DRM_IOCTL_GET_STATS, (unsigned long)stats); |
354 | if (err) | 354 | if (err) |
355 | return err; | 355 | return err; |
@@ -393,7 +393,7 @@ static int compat_drm_addbufs(struct file *file, unsigned int cmd, | |||
393 | || __put_user(agp_start, &buf->agp_start)) | 393 | || __put_user(agp_start, &buf->agp_start)) |
394 | return -EFAULT; | 394 | return -EFAULT; |
395 | 395 | ||
396 | err = drm_ioctl(file->f_dentry->d_inode, file, | 396 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
397 | DRM_IOCTL_ADD_BUFS, (unsigned long)buf); | 397 | DRM_IOCTL_ADD_BUFS, (unsigned long)buf); |
398 | if (err) | 398 | if (err) |
399 | return err; | 399 | return err; |
@@ -425,7 +425,7 @@ static int compat_drm_markbufs(struct file *file, unsigned int cmd, | |||
425 | || __put_user(b32.high_mark, &buf->high_mark)) | 425 | || __put_user(b32.high_mark, &buf->high_mark)) |
426 | return -EFAULT; | 426 | return -EFAULT; |
427 | 427 | ||
428 | return drm_ioctl(file->f_dentry->d_inode, file, | 428 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
429 | DRM_IOCTL_MARK_BUFS, (unsigned long)buf); | 429 | DRM_IOCTL_MARK_BUFS, (unsigned long)buf); |
430 | } | 430 | } |
431 | 431 | ||
@@ -467,7 +467,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd, | |||
467 | || __put_user(list, &request->list)) | 467 | || __put_user(list, &request->list)) |
468 | return -EFAULT; | 468 | return -EFAULT; |
469 | 469 | ||
470 | err = drm_ioctl(file->f_dentry->d_inode, file, | 470 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
471 | DRM_IOCTL_INFO_BUFS, (unsigned long)request); | 471 | DRM_IOCTL_INFO_BUFS, (unsigned long)request); |
472 | if (err) | 472 | if (err) |
473 | return err; | 473 | return err; |
@@ -529,7 +529,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd, | |||
529 | || __put_user(list, &request->list)) | 529 | || __put_user(list, &request->list)) |
530 | return -EFAULT; | 530 | return -EFAULT; |
531 | 531 | ||
532 | err = drm_ioctl(file->f_dentry->d_inode, file, | 532 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
533 | DRM_IOCTL_MAP_BUFS, (unsigned long)request); | 533 | DRM_IOCTL_MAP_BUFS, (unsigned long)request); |
534 | if (err) | 534 | if (err) |
535 | return err; | 535 | return err; |
@@ -576,7 +576,7 @@ static int compat_drm_freebufs(struct file *file, unsigned int cmd, | |||
576 | &request->list)) | 576 | &request->list)) |
577 | return -EFAULT; | 577 | return -EFAULT; |
578 | 578 | ||
579 | return drm_ioctl(file->f_dentry->d_inode, file, | 579 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
580 | DRM_IOCTL_FREE_BUFS, (unsigned long)request); | 580 | DRM_IOCTL_FREE_BUFS, (unsigned long)request); |
581 | } | 581 | } |
582 | 582 | ||
@@ -603,7 +603,7 @@ static int compat_drm_setsareactx(struct file *file, unsigned int cmd, | |||
603 | &request->handle)) | 603 | &request->handle)) |
604 | return -EFAULT; | 604 | return -EFAULT; |
605 | 605 | ||
606 | return drm_ioctl(file->f_dentry->d_inode, file, | 606 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
607 | DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request); | 607 | DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request); |
608 | } | 608 | } |
609 | 609 | ||
@@ -626,7 +626,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd, | |||
626 | if (__put_user(ctx_id, &request->ctx_id)) | 626 | if (__put_user(ctx_id, &request->ctx_id)) |
627 | return -EFAULT; | 627 | return -EFAULT; |
628 | 628 | ||
629 | err = drm_ioctl(file->f_dentry->d_inode, file, | 629 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
630 | DRM_IOCTL_GET_SAREA_CTX, (unsigned long)request); | 630 | DRM_IOCTL_GET_SAREA_CTX, (unsigned long)request); |
631 | if (err) | 631 | if (err) |
632 | return err; | 632 | return err; |
@@ -662,7 +662,7 @@ static int compat_drm_resctx(struct file *file, unsigned int cmd, | |||
662 | &res->contexts)) | 662 | &res->contexts)) |
663 | return -EFAULT; | 663 | return -EFAULT; |
664 | 664 | ||
665 | err = drm_ioctl(file->f_dentry->d_inode, file, | 665 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
666 | DRM_IOCTL_RES_CTX, (unsigned long)res); | 666 | DRM_IOCTL_RES_CTX, (unsigned long)res); |
667 | if (err) | 667 | if (err) |
668 | return err; | 668 | return err; |
@@ -716,7 +716,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd, | |||
716 | &d->request_sizes)) | 716 | &d->request_sizes)) |
717 | return -EFAULT; | 717 | return -EFAULT; |
718 | 718 | ||
719 | err = drm_ioctl(file->f_dentry->d_inode, file, | 719 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
720 | DRM_IOCTL_DMA, (unsigned long)d); | 720 | DRM_IOCTL_DMA, (unsigned long)d); |
721 | if (err) | 721 | if (err) |
722 | return err; | 722 | return err; |
@@ -749,7 +749,7 @@ static int compat_drm_agp_enable(struct file *file, unsigned int cmd, | |||
749 | if (put_user(m32.mode, &mode->mode)) | 749 | if (put_user(m32.mode, &mode->mode)) |
750 | return -EFAULT; | 750 | return -EFAULT; |
751 | 751 | ||
752 | return drm_ioctl(file->f_dentry->d_inode, file, | 752 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
753 | DRM_IOCTL_AGP_ENABLE, (unsigned long)mode); | 753 | DRM_IOCTL_AGP_ENABLE, (unsigned long)mode); |
754 | } | 754 | } |
755 | 755 | ||
@@ -779,7 +779,7 @@ static int compat_drm_agp_info(struct file *file, unsigned int cmd, | |||
779 | if (!access_ok(VERIFY_WRITE, info, sizeof(*info))) | 779 | if (!access_ok(VERIFY_WRITE, info, sizeof(*info))) |
780 | return -EFAULT; | 780 | return -EFAULT; |
781 | 781 | ||
782 | err = drm_ioctl(file->f_dentry->d_inode, file, | 782 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
783 | DRM_IOCTL_AGP_INFO, (unsigned long)info); | 783 | DRM_IOCTL_AGP_INFO, (unsigned long)info); |
784 | if (err) | 784 | if (err) |
785 | return err; | 785 | return err; |
@@ -825,7 +825,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, | |||
825 | || __put_user(req32.type, &request->type)) | 825 | || __put_user(req32.type, &request->type)) |
826 | return -EFAULT; | 826 | return -EFAULT; |
827 | 827 | ||
828 | err = drm_ioctl(file->f_dentry->d_inode, file, | 828 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
829 | DRM_IOCTL_AGP_ALLOC, (unsigned long)request); | 829 | DRM_IOCTL_AGP_ALLOC, (unsigned long)request); |
830 | if (err) | 830 | if (err) |
831 | return err; | 831 | return err; |
@@ -833,7 +833,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, | |||
833 | if (__get_user(req32.handle, &request->handle) | 833 | if (__get_user(req32.handle, &request->handle) |
834 | || __get_user(req32.physical, &request->physical) | 834 | || __get_user(req32.physical, &request->physical) |
835 | || copy_to_user(argp, &req32, sizeof(req32))) { | 835 | || copy_to_user(argp, &req32, sizeof(req32))) { |
836 | drm_ioctl(file->f_dentry->d_inode, file, | 836 | drm_ioctl(file->f_path.dentry->d_inode, file, |
837 | DRM_IOCTL_AGP_FREE, (unsigned long)request); | 837 | DRM_IOCTL_AGP_FREE, (unsigned long)request); |
838 | return -EFAULT; | 838 | return -EFAULT; |
839 | } | 839 | } |
@@ -854,7 +854,7 @@ static int compat_drm_agp_free(struct file *file, unsigned int cmd, | |||
854 | || __put_user(handle, &request->handle)) | 854 | || __put_user(handle, &request->handle)) |
855 | return -EFAULT; | 855 | return -EFAULT; |
856 | 856 | ||
857 | return drm_ioctl(file->f_dentry->d_inode, file, | 857 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
858 | DRM_IOCTL_AGP_FREE, (unsigned long)request); | 858 | DRM_IOCTL_AGP_FREE, (unsigned long)request); |
859 | } | 859 | } |
860 | 860 | ||
@@ -879,7 +879,7 @@ static int compat_drm_agp_bind(struct file *file, unsigned int cmd, | |||
879 | || __put_user(req32.offset, &request->offset)) | 879 | || __put_user(req32.offset, &request->offset)) |
880 | return -EFAULT; | 880 | return -EFAULT; |
881 | 881 | ||
882 | return drm_ioctl(file->f_dentry->d_inode, file, | 882 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
883 | DRM_IOCTL_AGP_BIND, (unsigned long)request); | 883 | DRM_IOCTL_AGP_BIND, (unsigned long)request); |
884 | } | 884 | } |
885 | 885 | ||
@@ -896,7 +896,7 @@ static int compat_drm_agp_unbind(struct file *file, unsigned int cmd, | |||
896 | || __put_user(handle, &request->handle)) | 896 | || __put_user(handle, &request->handle)) |
897 | return -EFAULT; | 897 | return -EFAULT; |
898 | 898 | ||
899 | return drm_ioctl(file->f_dentry->d_inode, file, | 899 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
900 | DRM_IOCTL_AGP_UNBIND, (unsigned long)request); | 900 | DRM_IOCTL_AGP_UNBIND, (unsigned long)request); |
901 | } | 901 | } |
902 | #endif /* __OS_HAS_AGP */ | 902 | #endif /* __OS_HAS_AGP */ |
@@ -921,7 +921,7 @@ static int compat_drm_sg_alloc(struct file *file, unsigned int cmd, | |||
921 | || __put_user(x, &request->size)) | 921 | || __put_user(x, &request->size)) |
922 | return -EFAULT; | 922 | return -EFAULT; |
923 | 923 | ||
924 | err = drm_ioctl(file->f_dentry->d_inode, file, | 924 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
925 | DRM_IOCTL_SG_ALLOC, (unsigned long)request); | 925 | DRM_IOCTL_SG_ALLOC, (unsigned long)request); |
926 | if (err) | 926 | if (err) |
927 | return err; | 927 | return err; |
@@ -948,7 +948,7 @@ static int compat_drm_sg_free(struct file *file, unsigned int cmd, | |||
948 | || __put_user(x << PAGE_SHIFT, &request->handle)) | 948 | || __put_user(x << PAGE_SHIFT, &request->handle)) |
949 | return -EFAULT; | 949 | return -EFAULT; |
950 | 950 | ||
951 | return drm_ioctl(file->f_dentry->d_inode, file, | 951 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
952 | DRM_IOCTL_SG_FREE, (unsigned long)request); | 952 | DRM_IOCTL_SG_FREE, (unsigned long)request); |
953 | } | 953 | } |
954 | 954 | ||
@@ -988,7 +988,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, | |||
988 | || __put_user(req32.request.signal, &request->request.signal)) | 988 | || __put_user(req32.request.signal, &request->request.signal)) |
989 | return -EFAULT; | 989 | return -EFAULT; |
990 | 990 | ||
991 | err = drm_ioctl(file->f_dentry->d_inode, file, | 991 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
992 | DRM_IOCTL_WAIT_VBLANK, (unsigned long)request); | 992 | DRM_IOCTL_WAIT_VBLANK, (unsigned long)request); |
993 | if (err) | 993 | if (err) |
994 | return err; | 994 | return err; |
@@ -1060,7 +1060,7 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
1060 | if (fn != NULL) | 1060 | if (fn != NULL) |
1061 | ret = (*fn) (filp, cmd, arg); | 1061 | ret = (*fn) (filp, cmd, arg); |
1062 | else | 1062 | else |
1063 | ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); | 1063 | ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); |
1064 | unlock_kernel(); | 1064 | unlock_kernel(); |
1065 | 1065 | ||
1066 | return ret; | 1066 | return ret; |
diff --git a/drivers/char/drm/i915_ioc32.c b/drivers/char/drm/i915_ioc32.c index 296248cdc76..1fe68a251b7 100644 --- a/drivers/char/drm/i915_ioc32.c +++ b/drivers/char/drm/i915_ioc32.c | |||
@@ -66,7 +66,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd, | |||
66 | &batchbuffer->cliprects)) | 66 | &batchbuffer->cliprects)) |
67 | return -EFAULT; | 67 | return -EFAULT; |
68 | 68 | ||
69 | return drm_ioctl(file->f_dentry->d_inode, file, | 69 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
70 | DRM_IOCTL_I915_BATCHBUFFER, | 70 | DRM_IOCTL_I915_BATCHBUFFER, |
71 | (unsigned long)batchbuffer); | 71 | (unsigned long)batchbuffer); |
72 | } | 72 | } |
@@ -102,7 +102,7 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd, | |||
102 | &cmdbuffer->cliprects)) | 102 | &cmdbuffer->cliprects)) |
103 | return -EFAULT; | 103 | return -EFAULT; |
104 | 104 | ||
105 | return drm_ioctl(file->f_dentry->d_inode, file, | 105 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
106 | DRM_IOCTL_I915_CMDBUFFER, (unsigned long)cmdbuffer); | 106 | DRM_IOCTL_I915_CMDBUFFER, (unsigned long)cmdbuffer); |
107 | } | 107 | } |
108 | 108 | ||
@@ -125,7 +125,7 @@ static int compat_i915_irq_emit(struct file *file, unsigned int cmd, | |||
125 | &request->irq_seq)) | 125 | &request->irq_seq)) |
126 | return -EFAULT; | 126 | return -EFAULT; |
127 | 127 | ||
128 | return drm_ioctl(file->f_dentry->d_inode, file, | 128 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
129 | DRM_IOCTL_I915_IRQ_EMIT, (unsigned long)request); | 129 | DRM_IOCTL_I915_IRQ_EMIT, (unsigned long)request); |
130 | } | 130 | } |
131 | typedef struct drm_i915_getparam32 { | 131 | typedef struct drm_i915_getparam32 { |
@@ -149,7 +149,7 @@ static int compat_i915_getparam(struct file *file, unsigned int cmd, | |||
149 | &request->value)) | 149 | &request->value)) |
150 | return -EFAULT; | 150 | return -EFAULT; |
151 | 151 | ||
152 | return drm_ioctl(file->f_dentry->d_inode, file, | 152 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
153 | DRM_IOCTL_I915_GETPARAM, (unsigned long)request); | 153 | DRM_IOCTL_I915_GETPARAM, (unsigned long)request); |
154 | } | 154 | } |
155 | 155 | ||
@@ -178,7 +178,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd, | |||
178 | &request->region_offset)) | 178 | &request->region_offset)) |
179 | return -EFAULT; | 179 | return -EFAULT; |
180 | 180 | ||
181 | return drm_ioctl(file->f_dentry->d_inode, file, | 181 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
182 | DRM_IOCTL_I915_ALLOC, (unsigned long)request); | 182 | DRM_IOCTL_I915_ALLOC, (unsigned long)request); |
183 | } | 183 | } |
184 | 184 | ||
@@ -215,7 +215,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
215 | if (fn != NULL) | 215 | if (fn != NULL) |
216 | ret = (*fn) (filp, cmd, arg); | 216 | ret = (*fn) (filp, cmd, arg); |
217 | else | 217 | else |
218 | ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); | 218 | ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); |
219 | unlock_kernel(); | 219 | unlock_kernel(); |
220 | 220 | ||
221 | return ret; | 221 | return ret; |
diff --git a/drivers/char/drm/mga_ioc32.c b/drivers/char/drm/mga_ioc32.c index 54a18eb2fc0..30d00478dde 100644 --- a/drivers/char/drm/mga_ioc32.c +++ b/drivers/char/drm/mga_ioc32.c | |||
@@ -100,7 +100,7 @@ static int compat_mga_init(struct file *file, unsigned int cmd, | |||
100 | if (err) | 100 | if (err) |
101 | return -EFAULT; | 101 | return -EFAULT; |
102 | 102 | ||
103 | return drm_ioctl(file->f_dentry->d_inode, file, | 103 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
104 | DRM_IOCTL_MGA_INIT, (unsigned long)init); | 104 | DRM_IOCTL_MGA_INIT, (unsigned long)init); |
105 | } | 105 | } |
106 | 106 | ||
@@ -125,7 +125,7 @@ static int compat_mga_getparam(struct file *file, unsigned int cmd, | |||
125 | &getparam->value)) | 125 | &getparam->value)) |
126 | return -EFAULT; | 126 | return -EFAULT; |
127 | 127 | ||
128 | return drm_ioctl(file->f_dentry->d_inode, file, | 128 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
129 | DRM_IOCTL_MGA_GETPARAM, (unsigned long)getparam); | 129 | DRM_IOCTL_MGA_GETPARAM, (unsigned long)getparam); |
130 | } | 130 | } |
131 | 131 | ||
@@ -166,7 +166,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd, | |||
166 | || __put_user(dma_bootstrap32.agp_size, &dma_bootstrap->agp_size)) | 166 | || __put_user(dma_bootstrap32.agp_size, &dma_bootstrap->agp_size)) |
167 | return -EFAULT; | 167 | return -EFAULT; |
168 | 168 | ||
169 | err = drm_ioctl(file->f_dentry->d_inode, file, | 169 | err = drm_ioctl(file->f_path.dentry->d_inode, file, |
170 | DRM_IOCTL_MGA_DMA_BOOTSTRAP, | 170 | DRM_IOCTL_MGA_DMA_BOOTSTRAP, |
171 | (unsigned long)dma_bootstrap); | 171 | (unsigned long)dma_bootstrap); |
172 | if (err) | 172 | if (err) |
@@ -224,7 +224,7 @@ long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
224 | if (fn != NULL) | 224 | if (fn != NULL) |
225 | ret = (*fn) (filp, cmd, arg); | 225 | ret = (*fn) (filp, cmd, arg); |
226 | else | 226 | else |
227 | ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); | 227 | ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); |
228 | unlock_kernel(); | 228 | unlock_kernel(); |
229 | 229 | ||
230 | return ret; | 230 | return ret; |
diff --git a/drivers/char/drm/r128_ioc32.c b/drivers/char/drm/r128_ioc32.c index 9dd6d4116e4..d3cb676eee8 100644 --- a/drivers/char/drm/r128_ioc32.c +++ b/drivers/char/drm/r128_ioc32.c | |||
@@ -95,7 +95,7 @@ static int compat_r128_init(struct file *file, unsigned int cmd, | |||
95 | &init->agp_textures_offset)) | 95 | &init->agp_textures_offset)) |
96 | return -EFAULT; | 96 | return -EFAULT; |
97 | 97 | ||
98 | return drm_ioctl(file->f_dentry->d_inode, file, | 98 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
99 | DRM_IOCTL_R128_INIT, (unsigned long)init); | 99 | DRM_IOCTL_R128_INIT, (unsigned long)init); |
100 | } | 100 | } |
101 | 101 | ||
@@ -129,7 +129,7 @@ static int compat_r128_depth(struct file *file, unsigned int cmd, | |||
129 | &depth->mask)) | 129 | &depth->mask)) |
130 | return -EFAULT; | 130 | return -EFAULT; |
131 | 131 | ||
132 | return drm_ioctl(file->f_dentry->d_inode, file, | 132 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
133 | DRM_IOCTL_R128_DEPTH, (unsigned long)depth); | 133 | DRM_IOCTL_R128_DEPTH, (unsigned long)depth); |
134 | 134 | ||
135 | } | 135 | } |
@@ -153,7 +153,7 @@ static int compat_r128_stipple(struct file *file, unsigned int cmd, | |||
153 | &stipple->mask)) | 153 | &stipple->mask)) |
154 | return -EFAULT; | 154 | return -EFAULT; |
155 | 155 | ||
156 | return drm_ioctl(file->f_dentry->d_inode, file, | 156 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
157 | DRM_IOCTL_R128_STIPPLE, (unsigned long)stipple); | 157 | DRM_IOCTL_R128_STIPPLE, (unsigned long)stipple); |
158 | } | 158 | } |
159 | 159 | ||
@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd, | |||
178 | &getparam->value)) | 178 | &getparam->value)) |
179 | return -EFAULT; | 179 | return -EFAULT; |
180 | 180 | ||
181 | return drm_ioctl(file->f_dentry->d_inode, file, | 181 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
182 | DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam); | 182 | DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam); |
183 | } | 183 | } |
184 | 184 | ||
@@ -214,7 +214,7 @@ long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
214 | if (fn != NULL) | 214 | if (fn != NULL) |
215 | ret = (*fn) (filp, cmd, arg); | 215 | ret = (*fn) (filp, cmd, arg); |
216 | else | 216 | else |
217 | ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); | 217 | ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); |
218 | unlock_kernel(); | 218 | unlock_kernel(); |
219 | 219 | ||
220 | return ret; | 220 | return ret; |
diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/char/drm/radeon_ioc32.c index 0ccfd3618ff..1f1f9cc055a 100644 --- a/drivers/char/drm/radeon_ioc32.c +++ b/drivers/char/drm/radeon_ioc32.c | |||
@@ -92,7 +92,7 @@ static int compat_radeon_cp_init(struct file *file, unsigned int cmd, | |||
92 | &init->gart_textures_offset)) | 92 | &init->gart_textures_offset)) |
93 | return -EFAULT; | 93 | return -EFAULT; |
94 | 94 | ||
95 | return drm_ioctl(file->f_dentry->d_inode, file, | 95 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
96 | DRM_IOCTL_RADEON_CP_INIT, (unsigned long)init); | 96 | DRM_IOCTL_RADEON_CP_INIT, (unsigned long)init); |
97 | } | 97 | } |
98 | 98 | ||
@@ -125,7 +125,7 @@ static int compat_radeon_cp_clear(struct file *file, unsigned int cmd, | |||
125 | &clr->depth_boxes)) | 125 | &clr->depth_boxes)) |
126 | return -EFAULT; | 126 | return -EFAULT; |
127 | 127 | ||
128 | return drm_ioctl(file->f_dentry->d_inode, file, | 128 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
129 | DRM_IOCTL_RADEON_CLEAR, (unsigned long)clr); | 129 | DRM_IOCTL_RADEON_CLEAR, (unsigned long)clr); |
130 | } | 130 | } |
131 | 131 | ||
@@ -149,7 +149,7 @@ static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd, | |||
149 | &request->mask)) | 149 | &request->mask)) |
150 | return -EFAULT; | 150 | return -EFAULT; |
151 | 151 | ||
152 | return drm_ioctl(file->f_dentry->d_inode, file, | 152 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
153 | DRM_IOCTL_RADEON_STIPPLE, (unsigned long)request); | 153 | DRM_IOCTL_RADEON_STIPPLE, (unsigned long)request); |
154 | } | 154 | } |
155 | 155 | ||
@@ -204,7 +204,7 @@ static int compat_radeon_cp_texture(struct file *file, unsigned int cmd, | |||
204 | &image->data)) | 204 | &image->data)) |
205 | return -EFAULT; | 205 | return -EFAULT; |
206 | 206 | ||
207 | return drm_ioctl(file->f_dentry->d_inode, file, | 207 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
208 | DRM_IOCTL_RADEON_TEXTURE, (unsigned long)request); | 208 | DRM_IOCTL_RADEON_TEXTURE, (unsigned long)request); |
209 | } | 209 | } |
210 | 210 | ||
@@ -238,7 +238,7 @@ static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd, | |||
238 | &request->prim)) | 238 | &request->prim)) |
239 | return -EFAULT; | 239 | return -EFAULT; |
240 | 240 | ||
241 | return drm_ioctl(file->f_dentry->d_inode, file, | 241 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
242 | DRM_IOCTL_RADEON_VERTEX2, (unsigned long)request); | 242 | DRM_IOCTL_RADEON_VERTEX2, (unsigned long)request); |
243 | } | 243 | } |
244 | 244 | ||
@@ -268,7 +268,7 @@ static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd, | |||
268 | &request->boxes)) | 268 | &request->boxes)) |
269 | return -EFAULT; | 269 | return -EFAULT; |
270 | 270 | ||
271 | return drm_ioctl(file->f_dentry->d_inode, file, | 271 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
272 | DRM_IOCTL_RADEON_CMDBUF, (unsigned long)request); | 272 | DRM_IOCTL_RADEON_CMDBUF, (unsigned long)request); |
273 | } | 273 | } |
274 | 274 | ||
@@ -293,7 +293,7 @@ static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd, | |||
293 | &request->value)) | 293 | &request->value)) |
294 | return -EFAULT; | 294 | return -EFAULT; |
295 | 295 | ||
296 | return drm_ioctl(file->f_dentry->d_inode, file, | 296 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
297 | DRM_IOCTL_RADEON_GETPARAM, (unsigned long)request); | 297 | DRM_IOCTL_RADEON_GETPARAM, (unsigned long)request); |
298 | } | 298 | } |
299 | 299 | ||
@@ -322,7 +322,7 @@ static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd, | |||
322 | &request->region_offset)) | 322 | &request->region_offset)) |
323 | return -EFAULT; | 323 | return -EFAULT; |
324 | 324 | ||
325 | return drm_ioctl(file->f_dentry->d_inode, file, | 325 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
326 | DRM_IOCTL_RADEON_ALLOC, (unsigned long)request); | 326 | DRM_IOCTL_RADEON_ALLOC, (unsigned long)request); |
327 | } | 327 | } |
328 | 328 | ||
@@ -345,7 +345,7 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd, | |||
345 | &request->irq_seq)) | 345 | &request->irq_seq)) |
346 | return -EFAULT; | 346 | return -EFAULT; |
347 | 347 | ||
348 | return drm_ioctl(file->f_dentry->d_inode, file, | 348 | return drm_ioctl(file->f_path.dentry->d_inode, file, |
349 | DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request); | 349 | DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request); |
350 | } | 350 | } |
351 | 351 | ||
@@ -386,7 +386,7 @@ long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
386 | if (fn != NULL) | 386 | if (fn != NULL) |
387 | ret = (*fn) (filp, cmd, arg); | 387 | ret = (*fn) (filp, cmd, arg); |
388 | else | 388 | else |
389 | ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); | 389 | ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); |
390 | unlock_kernel(); | 390 | unlock_kernel(); |
391 | 391 | ||
392 | return ret; | 392 | return ret; |