Skip to content

L
linux
Commit cc5ef55f authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files
Options

[PATCH] struct path: convert drm 

Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d817be9c
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
drivers/char/drm/drm_ioc32.c
View file @ cc5ef55f
...@@ -102,7 +102,7 @@ static int compat_drm_version(struct file *file, unsigned int cmd, ...@@ -102,7 +102,7 @@ static int compat_drm_version(struct file *file, unsigned int cmd,
&version->desc)) &version->desc))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_VERSION, (unsigned long)version); DRM_IOCTL_VERSION, (unsigned long)version);
if (err) if (err)
return err; return err;
...@@ -143,7 +143,7 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd, ...@@ -143,7 +143,7 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd,
&u->unique)) &u->unique))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_GET_UNIQUE, (unsigned long)u); DRM_IOCTL_GET_UNIQUE, (unsigned long)u);
if (err) if (err)
return err; return err;
...@@ -172,7 +172,7 @@ static int compat_drm_setunique(struct file *file, unsigned int cmd, ...@@ -172,7 +172,7 @@ static int compat_drm_setunique(struct file *file, unsigned int cmd,
&u->unique)) &u->unique))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_SET_UNIQUE, (unsigned long)u); DRM_IOCTL_SET_UNIQUE, (unsigned long)u);
} }
...@@ -203,7 +203,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd, ...@@ -203,7 +203,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd,
if (__put_user(idx, &map->offset)) if (__put_user(idx, &map->offset))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_GET_MAP, (unsigned long)map); DRM_IOCTL_GET_MAP, (unsigned long)map);
if (err) if (err)
return err; return err;
...@@ -244,7 +244,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, ...@@ -244,7 +244,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd,
|| __put_user(m32.flags, &map->flags)) || __put_user(m32.flags, &map->flags))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_ADD_MAP, (unsigned long)map); DRM_IOCTL_ADD_MAP, (unsigned long)map);
if (err) if (err)
return err; return err;
...@@ -282,7 +282,7 @@ static int compat_drm_rmmap(struct file *file, unsigned int cmd, ...@@ -282,7 +282,7 @@ static int compat_drm_rmmap(struct file *file, unsigned int cmd,
if (__put_user((void *)(unsigned long)handle, &map->handle)) if (__put_user((void *)(unsigned long)handle, &map->handle))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RM_MAP, (unsigned long)map); DRM_IOCTL_RM_MAP, (unsigned long)map);
} }
...@@ -312,7 +312,7 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd, ...@@ -312,7 +312,7 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd,
if (__put_user(idx, &client->idx)) if (__put_user(idx, &client->idx))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_GET_CLIENT, (unsigned long)client); DRM_IOCTL_GET_CLIENT, (unsigned long)client);
if (err) if (err)
return err; return err;
...@@ -349,7 +349,7 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd, ...@@ -349,7 +349,7 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd,
if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats))) if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats)))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_GET_STATS, (unsigned long)stats); DRM_IOCTL_GET_STATS, (unsigned long)stats);
if (err) if (err)
return err; return err;
...@@ -393,7 +393,7 @@ static int compat_drm_addbufs(struct file *file, unsigned int cmd, ...@@ -393,7 +393,7 @@ static int compat_drm_addbufs(struct file *file, unsigned int cmd,
|| __put_user(agp_start, &buf->agp_start)) || __put_user(agp_start, &buf->agp_start))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_ADD_BUFS, (unsigned long)buf); DRM_IOCTL_ADD_BUFS, (unsigned long)buf);
if (err) if (err)
return err; return err;
...@@ -425,7 +425,7 @@ static int compat_drm_markbufs(struct file *file, unsigned int cmd, ...@@ -425,7 +425,7 @@ static int compat_drm_markbufs(struct file *file, unsigned int cmd,
|| __put_user(b32.high_mark, &buf->high_mark)) || __put_user(b32.high_mark, &buf->high_mark))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_MARK_BUFS, (unsigned long)buf); DRM_IOCTL_MARK_BUFS, (unsigned long)buf);
} }
...@@ -467,7 +467,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd, ...@@ -467,7 +467,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
|| __put_user(list, &request->list)) || __put_user(list, &request->list))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_INFO_BUFS, (unsigned long)request); DRM_IOCTL_INFO_BUFS, (unsigned long)request);
if (err) if (err)
return err; return err;
...@@ -529,7 +529,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd, ...@@ -529,7 +529,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
|| __put_user(list, &request->list)) || __put_user(list, &request->list))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_MAP_BUFS, (unsigned long)request); DRM_IOCTL_MAP_BUFS, (unsigned long)request);
if (err) if (err)
return err; return err;
...@@ -576,7 +576,7 @@ static int compat_drm_freebufs(struct file *file, unsigned int cmd, ...@@ -576,7 +576,7 @@ static int compat_drm_freebufs(struct file *file, unsigned int cmd,
&request->list)) &request->list))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_FREE_BUFS, (unsigned long)request); DRM_IOCTL_FREE_BUFS, (unsigned long)request);
} }
...@@ -603,7 +603,7 @@ static int compat_drm_setsareactx(struct file *file, unsigned int cmd, ...@@ -603,7 +603,7 @@ static int compat_drm_setsareactx(struct file *file, unsigned int cmd,
&request->handle)) &request->handle))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request); DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request);
} }
...@@ -626,7 +626,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd, ...@@ -626,7 +626,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd,
if (__put_user(ctx_id, &request->ctx_id)) if (__put_user(ctx_id, &request->ctx_id))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_GET_SAREA_CTX, (unsigned long)request); DRM_IOCTL_GET_SAREA_CTX, (unsigned long)request);
if (err) if (err)
return err; return err;
...@@ -662,7 +662,7 @@ static int compat_drm_resctx(struct file *file, unsigned int cmd, ...@@ -662,7 +662,7 @@ static int compat_drm_resctx(struct file *file, unsigned int cmd,
&res->contexts)) &res->contexts))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RES_CTX, (unsigned long)res); DRM_IOCTL_RES_CTX, (unsigned long)res);
if (err) if (err)
return err; return err;
...@@ -716,7 +716,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd, ...@@ -716,7 +716,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd,
&d->request_sizes)) &d->request_sizes))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_DMA, (unsigned long)d); DRM_IOCTL_DMA, (unsigned long)d);
if (err) if (err)
return err; return err;
...@@ -749,7 +749,7 @@ static int compat_drm_agp_enable(struct file *file, unsigned int cmd, ...@@ -749,7 +749,7 @@ static int compat_drm_agp_enable(struct file *file, unsigned int cmd,
if (put_user(m32.mode, &mode->mode)) if (put_user(m32.mode, &mode->mode))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_ENABLE, (unsigned long)mode); DRM_IOCTL_AGP_ENABLE, (unsigned long)mode);
} }
...@@ -779,7 +779,7 @@ static int compat_drm_agp_info(struct file *file, unsigned int cmd, ...@@ -779,7 +779,7 @@ static int compat_drm_agp_info(struct file *file, unsigned int cmd,
if (!access_ok(VERIFY_WRITE, info, sizeof(*info))) if (!access_ok(VERIFY_WRITE, info, sizeof(*info)))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_INFO, (unsigned long)info); DRM_IOCTL_AGP_INFO, (unsigned long)info);
if (err) if (err)
return err; return err;
...@@ -825,7 +825,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, ...@@ -825,7 +825,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd,
|| __put_user(req32.type, &request->type)) || __put_user(req32.type, &request->type))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_ALLOC, (unsigned long)request); DRM_IOCTL_AGP_ALLOC, (unsigned long)request);
if (err) if (err)
return err; return err;
...@@ -833,7 +833,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, ...@@ -833,7 +833,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd,
if (__get_user(req32.handle, &request->handle) if (__get_user(req32.handle, &request->handle)
|| __get_user(req32.physical, &request->physical) || __get_user(req32.physical, &request->physical)
|| copy_to_user(argp, &req32, sizeof(req32))) { || copy_to_user(argp, &req32, sizeof(req32))) {
drm_ioctl(file->f_dentry->d_inode, file, drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_FREE, (unsigned long)request); DRM_IOCTL_AGP_FREE, (unsigned long)request);
return -EFAULT; return -EFAULT;
} }
...@@ -854,7 +854,7 @@ static int compat_drm_agp_free(struct file *file, unsigned int cmd, ...@@ -854,7 +854,7 @@ static int compat_drm_agp_free(struct file *file, unsigned int cmd,
|| __put_user(handle, &request->handle)) || __put_user(handle, &request->handle))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_FREE, (unsigned long)request); DRM_IOCTL_AGP_FREE, (unsigned long)request);
} }
...@@ -879,7 +879,7 @@ static int compat_drm_agp_bind(struct file *file, unsigned int cmd, ...@@ -879,7 +879,7 @@ static int compat_drm_agp_bind(struct file *file, unsigned int cmd,
|| __put_user(req32.offset, &request->offset)) || __put_user(req32.offset, &request->offset))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_BIND, (unsigned long)request); DRM_IOCTL_AGP_BIND, (unsigned long)request);
} }
...@@ -896,7 +896,7 @@ static int compat_drm_agp_unbind(struct file *file, unsigned int cmd, ...@@ -896,7 +896,7 @@ static int compat_drm_agp_unbind(struct file *file, unsigned int cmd,
|| __put_user(handle, &request->handle)) || __put_user(handle, &request->handle))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_AGP_UNBIND, (unsigned long)request); DRM_IOCTL_AGP_UNBIND, (unsigned long)request);
} }
#endif /* __OS_HAS_AGP */ #endif /* __OS_HAS_AGP */
...@@ -921,7 +921,7 @@ static int compat_drm_sg_alloc(struct file *file, unsigned int cmd, ...@@ -921,7 +921,7 @@ static int compat_drm_sg_alloc(struct file *file, unsigned int cmd,
|| __put_user(x, &request->size)) || __put_user(x, &request->size))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_SG_ALLOC, (unsigned long)request); DRM_IOCTL_SG_ALLOC, (unsigned long)request);
if (err) if (err)
return err; return err;
...@@ -948,7 +948,7 @@ static int compat_drm_sg_free(struct file *file, unsigned int cmd, ...@@ -948,7 +948,7 @@ static int compat_drm_sg_free(struct file *file, unsigned int cmd,
|| __put_user(x << PAGE_SHIFT, &request->handle)) || __put_user(x << PAGE_SHIFT, &request->handle))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_SG_FREE, (unsigned long)request); DRM_IOCTL_SG_FREE, (unsigned long)request);
} }
...@@ -988,7 +988,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, ...@@ -988,7 +988,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
|| __put_user(req32.request.signal, &request->request.signal)) || __put_user(req32.request.signal, &request->request.signal))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_WAIT_VBLANK, (unsigned long)request); DRM_IOCTL_WAIT_VBLANK, (unsigned long)request);
if (err) if (err)
return err; return err;
...@@ -1060,7 +1060,7 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -1060,7 +1060,7 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (fn != NULL) if (fn != NULL)
ret = (*fn) (filp, cmd, arg); ret = (*fn) (filp, cmd, arg);
else else
ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
unlock_kernel(); unlock_kernel();
return ret; return ret;
......
drivers/char/drm/i915_ioc32.c
View file @ cc5ef55f
...@@ -66,7 +66,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd, ...@@ -66,7 +66,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
&batchbuffer->cliprects)) &batchbuffer->cliprects))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_I915_BATCHBUFFER, DRM_IOCTL_I915_BATCHBUFFER,
(unsigned long)batchbuffer); (unsigned long)batchbuffer);
} }
...@@ -102,7 +102,7 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd, ...@@ -102,7 +102,7 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
&cmdbuffer->cliprects)) &cmdbuffer->cliprects))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_I915_CMDBUFFER, (unsigned long)cmdbuffer); DRM_IOCTL_I915_CMDBUFFER, (unsigned long)cmdbuffer);
} }
...@@ -125,7 +125,7 @@ static int compat_i915_irq_emit(struct file *file, unsigned int cmd, ...@@ -125,7 +125,7 @@ static int compat_i915_irq_emit(struct file *file, unsigned int cmd,
&request->irq_seq)) &request->irq_seq))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_I915_IRQ_EMIT, (unsigned long)request); DRM_IOCTL_I915_IRQ_EMIT, (unsigned long)request);
} }
typedef struct drm_i915_getparam32 { typedef struct drm_i915_getparam32 {
...@@ -149,7 +149,7 @@ static int compat_i915_getparam(struct file *file, unsigned int cmd, ...@@ -149,7 +149,7 @@ static int compat_i915_getparam(struct file *file, unsigned int cmd,
&request->value)) &request->value))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_I915_GETPARAM, (unsigned long)request); DRM_IOCTL_I915_GETPARAM, (unsigned long)request);
} }
...@@ -178,7 +178,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd, ...@@ -178,7 +178,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
&request->region_offset)) &request->region_offset))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_I915_ALLOC, (unsigned long)request); DRM_IOCTL_I915_ALLOC, (unsigned long)request);
} }
...@@ -215,7 +215,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -215,7 +215,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (fn != NULL) if (fn != NULL)
ret = (*fn) (filp, cmd, arg); ret = (*fn) (filp, cmd, arg);
else else
ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
unlock_kernel(); unlock_kernel();
return ret; return ret;
......
drivers/char/drm/mga_ioc32.c
View file @ cc5ef55f
...@@ -100,7 +100,7 @@ static int compat_mga_init(struct file *file, unsigned int cmd, ...@@ -100,7 +100,7 @@ static int compat_mga_init(struct file *file, unsigned int cmd,
if (err) if (err)
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_MGA_INIT, (unsigned long)init); DRM_IOCTL_MGA_INIT, (unsigned long)init);
} }
...@@ -125,7 +125,7 @@ static int compat_mga_getparam(struct file *file, unsigned int cmd, ...@@ -125,7 +125,7 @@ static int compat_mga_getparam(struct file *file, unsigned int cmd,
&getparam->value)) &getparam->value))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_MGA_GETPARAM, (unsigned long)getparam); DRM_IOCTL_MGA_GETPARAM, (unsigned long)getparam);
} }
...@@ -166,7 +166,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd, ...@@ -166,7 +166,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
|| __put_user(dma_bootstrap32.agp_size, &dma_bootstrap->agp_size)) || __put_user(dma_bootstrap32.agp_size, &dma_bootstrap->agp_size))
return -EFAULT; return -EFAULT;
err = drm_ioctl(file->f_dentry->d_inode, file, err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_MGA_DMA_BOOTSTRAP, DRM_IOCTL_MGA_DMA_BOOTSTRAP,
(unsigned long)dma_bootstrap); (unsigned long)dma_bootstrap);
if (err) if (err)
...@@ -224,7 +224,7 @@ long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -224,7 +224,7 @@ long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (fn != NULL) if (fn != NULL)
ret = (*fn) (filp, cmd, arg); ret = (*fn) (filp, cmd, arg);
else else
ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
unlock_kernel(); unlock_kernel();
return ret; return ret;
......
drivers/char/drm/r128_ioc32.c
View file @ cc5ef55f
...@@ -95,7 +95,7 @@ static int compat_r128_init(struct file *file, unsigned int cmd, ...@@ -95,7 +95,7 @@ static int compat_r128_init(struct file *file, unsigned int cmd,
&init->agp_textures_offset)) &init->agp_textures_offset))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_R128_INIT, (unsigned long)init); DRM_IOCTL_R128_INIT, (unsigned long)init);
} }
...@@ -129,7 +129,7 @@ static int compat_r128_depth(struct file *file, unsigned int cmd, ...@@ -129,7 +129,7 @@ static int compat_r128_depth(struct file *file, unsigned int cmd,
&depth->mask)) &depth->mask))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_R128_DEPTH, (unsigned long)depth); DRM_IOCTL_R128_DEPTH, (unsigned long)depth);
} }
...@@ -153,7 +153,7 @@ static int compat_r128_stipple(struct file *file, unsigned int cmd, ...@@ -153,7 +153,7 @@ static int compat_r128_stipple(struct file *file, unsigned int cmd,
&stipple->mask)) &stipple->mask))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_R128_STIPPLE, (unsigned long)stipple); DRM_IOCTL_R128_STIPPLE, (unsigned long)stipple);
} }
...@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd, ...@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
&getparam->value)) &getparam->value))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam); DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
} }
...@@ -214,7 +214,7 @@ long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -214,7 +214,7 @@ long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (fn != NULL) if (fn != NULL)
ret = (*fn) (filp, cmd, arg); ret = (*fn) (filp, cmd, arg);
else else
ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
unlock_kernel(); unlock_kernel();
return ret; return ret;
......
drivers/char/drm/radeon_ioc32.c
View file @ cc5ef55f
...@@ -92,7 +92,7 @@ static int compat_radeon_cp_init(struct file *file, unsigned int cmd, ...@@ -92,7 +92,7 @@ static int compat_radeon_cp_init(struct file *file, unsigned int cmd,
&init->gart_textures_offset)) &init->gart_textures_offset))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_CP_INIT, (unsigned long)init); DRM_IOCTL_RADEON_CP_INIT, (unsigned long)init);
} }
...@@ -125,7 +125,7 @@ static int compat_radeon_cp_clear(struct file *file, unsigned int cmd, ...@@ -125,7 +125,7 @@ static int compat_radeon_cp_clear(struct file *file, unsigned int cmd,
&clr->depth_boxes)) &clr->depth_boxes))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_CLEAR, (unsigned long)clr); DRM_IOCTL_RADEON_CLEAR, (unsigned long)clr);
} }
...@@ -149,7 +149,7 @@ static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd, ...@@ -149,7 +149,7 @@ static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd,
&request->mask)) &request->mask))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_STIPPLE, (unsigned long)request); DRM_IOCTL_RADEON_STIPPLE, (unsigned long)request);
} }
...@@ -204,7 +204,7 @@ static int compat_radeon_cp_texture(struct file *file, unsigned int cmd, ...@@ -204,7 +204,7 @@ static int compat_radeon_cp_texture(struct file *file, unsigned int cmd,
&image->data)) &image->data))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_TEXTURE, (unsigned long)request); DRM_IOCTL_RADEON_TEXTURE, (unsigned long)request);
} }
...@@ -238,7 +238,7 @@ static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd, ...@@ -238,7 +238,7 @@ static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd,
&request->prim)) &request->prim))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_VERTEX2, (unsigned long)request); DRM_IOCTL_RADEON_VERTEX2, (unsigned long)request);
} }
...@@ -268,7 +268,7 @@ static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd, ...@@ -268,7 +268,7 @@ static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd,
&request->boxes)) &request->boxes))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_CMDBUF, (unsigned long)request); DRM_IOCTL_RADEON_CMDBUF, (unsigned long)request);
} }
...@@ -293,7 +293,7 @@ static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd, ...@@ -293,7 +293,7 @@ static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd,
&request->value)) &request->value))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_GETPARAM, (unsigned long)request); DRM_IOCTL_RADEON_GETPARAM, (unsigned long)request);
} }
...@@ -322,7 +322,7 @@ static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd, ...@@ -322,7 +322,7 @@ static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd,
&request->region_offset)) &request->region_offset))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_ALLOC, (unsigned long)request); DRM_IOCTL_RADEON_ALLOC, (unsigned long)request);
} }
...@@ -345,7 +345,7 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd, ...@@ -345,7 +345,7 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
&request->irq_seq)) &request->irq_seq))
return -EFAULT; return -EFAULT;
return drm_ioctl(file->f_dentry->d_inode, file, return drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request); DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request);
} }
...@@ -386,7 +386,7 @@ long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -386,7 +386,7 @@ long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (fn != NULL) if (fn != NULL)
ret = (*fn) (filp, cmd, arg); ret = (*fn) (filp, cmd, arg);
else else
ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
unlock_kernel(); unlock_kernel();
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7