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/i915_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/i915_ioc32.c')
-rw-r--r-- | drivers/char/drm/i915_ioc32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/drm/i915_ioc32.c b/drivers/char/drm/i915_ioc32.c index 296248cdc767..1fe68a251b75 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; |