proc: convert everything to "struct proc_ops"
The most notable change is DEFINE_SHOW_ATTRIBUTE macro split in seq_file.h. Conversion rule is: llseek => proc_lseek unlocked_ioctl => proc_ioctl xxx => proc_xxx delete ".owner = THIS_MODULE" line [akpm@linux-foundation.org: fix drivers/isdn/capi/kcapi_proc.c] [sfr@canb.auug.org.au: fix kernel/sched/psi.c] Link: http://lkml.kernel.org/r/20200122180545.36222f50@canb.auug.org.au Link: http://lkml.kernel.org/r/20191225172546.GB13378@avx2 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d56c0d45f0
commit
97a32539b9
@@ -119,13 +119,12 @@ static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,
|
||||
return res;
|
||||
}
|
||||
|
||||
static const struct file_operations srm_env_proc_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = srm_env_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
.write = srm_env_proc_write,
|
||||
static const struct proc_ops srm_env_proc_ops = {
|
||||
.proc_open = srm_env_proc_open,
|
||||
.proc_read = seq_read,
|
||||
.proc_lseek = seq_lseek,
|
||||
.proc_release = single_release,
|
||||
.proc_write = srm_env_proc_write,
|
||||
};
|
||||
|
||||
static int __init
|
||||
@@ -182,7 +181,7 @@ srm_env_init(void)
|
||||
entry = srm_named_entries;
|
||||
while (entry->name && entry->id) {
|
||||
if (!proc_create_data(entry->name, 0644, named_dir,
|
||||
&srm_env_proc_fops, (void *)entry->id))
|
||||
&srm_env_proc_ops, (void *)entry->id))
|
||||
goto cleanup;
|
||||
entry++;
|
||||
}
|
||||
@@ -194,7 +193,7 @@ srm_env_init(void)
|
||||
char name[4];
|
||||
sprintf(name, "%ld", var_num);
|
||||
if (!proc_create_data(name, 0644, numbered_dir,
|
||||
&srm_env_proc_fops, (void *)var_num))
|
||||
&srm_env_proc_ops, (void *)var_num))
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user