Skip to content

Commit

Permalink
drm: use proc_create_data()
Browse files Browse the repository at this point in the history
airlied: fixup race against drm info by filling out
tmp before adding it to proc.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Alexey Dobriyan authored and Dave Airlie committed Aug 30, 2009
1 parent 882f021 commit 3b51096
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/gpu/drm/drm_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,21 @@ int drm_proc_create_files(struct drm_info_list *files, int count,
ret = -1;
goto fail;
}
ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root);
tmp->minor = minor;
tmp->info_ent = &files[i];
list_add(&tmp->list, &minor->proc_nodes.list);

ent = proc_create_data(files[i].name, S_IRUGO, root,
&drm_proc_fops, tmp);
if (!ent) {
DRM_ERROR("Cannot create /proc/dri/%s/%s\n",
name, files[i].name);
list_del(&tmp->list);
kfree(tmp);
ret = -1;
goto fail;
}

ent->proc_fops = &drm_proc_fops;
ent->data = tmp;
tmp->minor = minor;
tmp->info_ent = &files[i];
list_add(&(tmp->list), &(minor->proc_nodes.list));
}
return 0;

Expand Down

0 comments on commit 3b51096

Please sign in to comment.