drm: Kill file_priv->ioctl_count tracking
It's racy, and it's only used in debugfs. There are simpler ways to know whether something is going on (like looking at dmesg with full debugging enabled). And they're all much more useful. So let's just rip this out. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
43d1337cbe
commit
5952fba501
|
@ -315,8 +315,6 @@ long drm_ioctl(struct file *filp,
|
|||
if (drm_device_is_unplugged(dev))
|
||||
return -ENODEV;
|
||||
|
||||
++file_priv->ioctl_count;
|
||||
|
||||
if ((nr >= DRM_CORE_IOCTL_COUNT) &&
|
||||
((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
|
||||
goto err_i1;
|
||||
|
|
|
@ -232,7 +232,6 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
|
|||
goto out_put_pid;
|
||||
}
|
||||
|
||||
priv->ioctl_count = 0;
|
||||
/* for compatibility root is always authenticated */
|
||||
priv->always_authenticated = capable(CAP_SYS_ADMIN);
|
||||
priv->authenticated = priv->always_authenticated;
|
||||
|
|
|
@ -186,14 +186,14 @@ int drm_clients_info(struct seq_file *m, void *data)
|
|||
struct drm_file *priv;
|
||||
|
||||
mutex_lock(&dev->struct_mutex);
|
||||
seq_printf(m, "a dev pid uid magic ioctls\n\n");
|
||||
seq_printf(m, "a dev pid uid magic\n\n");
|
||||
list_for_each_entry(priv, &dev->filelist, lhead) {
|
||||
seq_printf(m, "%c %3d %5d %5d %10u %10lu\n",
|
||||
seq_printf(m, "%c %3d %5d %5d %10u\n",
|
||||
priv->authenticated ? 'y' : 'n',
|
||||
priv->minor->index,
|
||||
pid_vnr(priv->pid),
|
||||
from_kuid_munged(seq_user_ns(m), priv->uid),
|
||||
priv->magic, priv->ioctl_count);
|
||||
priv->magic);
|
||||
}
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
return 0;
|
||||
|
|
|
@ -438,7 +438,6 @@ struct drm_file {
|
|||
struct pid *pid;
|
||||
kuid_t uid;
|
||||
drm_magic_t magic;
|
||||
unsigned long ioctl_count;
|
||||
struct list_head lhead;
|
||||
struct drm_minor *minor;
|
||||
unsigned long lock_count;
|
||||
|
|
Loading…
Reference in a new issue