proc: convert everything to "struct proc_ops"

[sfrench/cifs-2.6.git] / kernel / sched / psi.c

diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index db7b50bba3f1f181e03e5911f365759ecf3acf99..ac4bd0ca11cce3149d8e5a76020e339c725edad3 100644 (file)
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -1251,40 +1251,40 @@ static int psi_fop_release(struct inode *inode, struct file *file)
        return single_release(inode, file);
 }
 
-static const struct file_operations psi_io_fops = {
-       .open           = psi_io_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .write          = psi_io_write,
-       .poll           = psi_fop_poll,
-       .release        = psi_fop_release,
+static const struct proc_ops psi_io_proc_ops = {
+       .proc_open      = psi_io_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_write     = psi_io_write,
+       .proc_poll      = psi_fop_poll,
+       .proc_release   = psi_fop_release,
 };
 
-static const struct file_operations psi_memory_fops = {
-       .open           = psi_memory_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .write          = psi_memory_write,
-       .poll           = psi_fop_poll,
-       .release        = psi_fop_release,
+static const struct proc_ops psi_memory_proc_ops = {
+       .proc_open      = psi_memory_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_write     = psi_memory_write,
+       .proc_poll      = psi_fop_poll,
+       .proc_release   = psi_fop_release,
 };
 
-static const struct file_operations psi_cpu_fops = {
-       .open           = psi_cpu_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .write          = psi_cpu_write,
-       .poll           = psi_fop_poll,
-       .release        = psi_fop_release,
+static const struct proc_ops psi_cpu_proc_ops = {
+       .proc_open      = psi_cpu_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_write     = psi_cpu_write,
+       .proc_poll      = psi_fop_poll,
+       .proc_release   = psi_fop_release,
 };
 
 static int __init psi_proc_init(void)
 {
        if (psi_enable) {
                proc_mkdir("pressure", NULL);
-               proc_create("pressure/io", 0, NULL, &psi_io_fops);
-               proc_create("pressure/memory", 0, NULL, &psi_memory_fops);
-               proc_create("pressure/cpu", 0, NULL, &psi_cpu_fops);
+               proc_create("pressure/io", 0, NULL, &psi_io_proc_ops);
+               proc_create("pressure/memory", 0, NULL, &psi_memory_proc_ops);
+               proc_create("pressure/cpu", 0, NULL, &psi_cpu_proc_ops);
        }
        return 0;
 }