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/drm_ioc32.c | |
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/drm_ioc32.c')
-rw-r--r-- | drivers/char/drm/drm_ioc32.c | 56 |
1 files changed, 28 insertions, 28 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; |