diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 13:00:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 13:00:01 -0400 |
commit | cf626b0da78df6669c6b5f51ddd9a70a0702e579 (patch) | |
tree | 45d29a4cb7574aed7f140814ed22088ded21c291 /kernel/sched/debug.c | |
parent | 9c50eafc32ddbd166c8a2bbaecd4ad201c452b14 (diff) | |
parent | 5ef03dbd91855544cd4c7c1910c3ef5226ee87e8 (diff) |
Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull procfs updates from Al Viro:
"Christoph's proc_create_... cleanups series"
* 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (44 commits)
xfs, proc: hide unused xfs procfs helpers
isdn/gigaset: add back gigaset_procinfo assignment
proc: update SIZEOF_PDE_INLINE_NAME for the new pde fields
tty: replace ->proc_fops with ->proc_show
ide: replace ->proc_fops with ->proc_show
ide: remove ide_driver_proc_write
isdn: replace ->proc_fops with ->proc_show
atm: switch to proc_create_seq_private
atm: simplify procfs code
bluetooth: switch to proc_create_seq_data
netfilter/x_tables: switch to proc_create_seq_private
netfilter/xt_hashlimit: switch to proc_create_{seq,single}_data
neigh: switch to proc_create_seq_data
hostap: switch to proc_create_{seq,single}_data
bonding: switch to proc_create_seq_data
rtc/proc: switch to proc_create_single_data
drbd: switch to proc_create_single
resource: switch to proc_create_seq_data
staging/rtl8192u: simplify procfs code
jfs: simplify procfs code
...
Diffstat (limited to 'kernel/sched/debug.c')
-rw-r--r-- | kernel/sched/debug.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 15b10e210a6b..e593b4118578 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c | |||
@@ -823,35 +823,9 @@ static const struct seq_operations sched_debug_sops = { | |||
823 | .show = sched_debug_show, | 823 | .show = sched_debug_show, |
824 | }; | 824 | }; |
825 | 825 | ||
826 | static int sched_debug_release(struct inode *inode, struct file *file) | ||
827 | { | ||
828 | seq_release(inode, file); | ||
829 | |||
830 | return 0; | ||
831 | } | ||
832 | |||
833 | static int sched_debug_open(struct inode *inode, struct file *filp) | ||
834 | { | ||
835 | int ret = 0; | ||
836 | |||
837 | ret = seq_open(filp, &sched_debug_sops); | ||
838 | |||
839 | return ret; | ||
840 | } | ||
841 | |||
842 | static const struct file_operations sched_debug_fops = { | ||
843 | .open = sched_debug_open, | ||
844 | .read = seq_read, | ||
845 | .llseek = seq_lseek, | ||
846 | .release = sched_debug_release, | ||
847 | }; | ||
848 | |||
849 | static int __init init_sched_debug_procfs(void) | 826 | static int __init init_sched_debug_procfs(void) |
850 | { | 827 | { |
851 | struct proc_dir_entry *pe; | 828 | if (!proc_create_seq("sched_debug", 0444, NULL, &sched_debug_sops)) |
852 | |||
853 | pe = proc_create("sched_debug", 0444, NULL, &sched_debug_fops); | ||
854 | if (!pe) | ||
855 | return -ENOMEM; | 829 | return -ENOMEM; |
856 | return 0; | 830 | return 0; |
857 | } | 831 | } |