Commit 22ade7e7 authored by David Howells's avatar David Howells

afs: Rearrange fs/afs/proc.c by moving fops and open functions down

Rearrange fs/afs/proc.c by moving fops and open functions down so as to
remove predeclarations.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 10495a00
...@@ -27,13 +27,10 @@ static inline struct afs_net *afs_seq2net(struct seq_file *m) ...@@ -27,13 +27,10 @@ static inline struct afs_net *afs_seq2net(struct seq_file *m)
return &__afs_net; // TODO: use seq_file_net(m) return &__afs_net; // TODO: use seq_file_net(m)
} }
static int afs_proc_cells_open(struct inode *inode, struct file *file);
static void *afs_proc_cells_start(struct seq_file *p, loff_t *pos); static void *afs_proc_cells_start(struct seq_file *p, loff_t *pos);
static void *afs_proc_cells_next(struct seq_file *p, void *v, loff_t *pos); static void *afs_proc_cells_next(struct seq_file *p, void *v, loff_t *pos);
static void afs_proc_cells_stop(struct seq_file *p, void *v); static void afs_proc_cells_stop(struct seq_file *p, void *v);
static int afs_proc_cells_show(struct seq_file *m, void *v); static int afs_proc_cells_show(struct seq_file *m, void *v);
static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf,
size_t size, loff_t *_pos);
static const struct seq_operations afs_proc_cells_ops = { static const struct seq_operations afs_proc_cells_ops = {
.start = afs_proc_cells_start, .start = afs_proc_cells_start,
...@@ -42,26 +39,6 @@ static const struct seq_operations afs_proc_cells_ops = { ...@@ -42,26 +39,6 @@ static const struct seq_operations afs_proc_cells_ops = {
.show = afs_proc_cells_show, .show = afs_proc_cells_show,
}; };
static const struct file_operations afs_proc_cells_fops = {
.open = afs_proc_cells_open,
.read = seq_read,
.write = afs_proc_cells_write,
.llseek = seq_lseek,
.release = seq_release,
};
static ssize_t afs_proc_rootcell_read(struct file *file, char __user *buf,
size_t size, loff_t *_pos);
static ssize_t afs_proc_rootcell_write(struct file *file,
const char __user *buf,
size_t size, loff_t *_pos);
static const struct file_operations afs_proc_rootcell_fops = {
.read = afs_proc_rootcell_read,
.write = afs_proc_rootcell_write,
.llseek = no_llseek,
};
static void *afs_proc_cell_volumes_start(struct seq_file *p, loff_t *pos); static void *afs_proc_cell_volumes_start(struct seq_file *p, loff_t *pos);
static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v, static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v,
loff_t *pos); loff_t *pos);
...@@ -101,16 +78,11 @@ static const struct seq_operations afs_proc_servers_ops = { ...@@ -101,16 +78,11 @@ static const struct seq_operations afs_proc_servers_ops = {
.show = afs_proc_servers_show, .show = afs_proc_servers_show,
}; };
static int afs_proc_sysname_open(struct inode *inode, struct file *file);
static int afs_proc_sysname_release(struct inode *inode, struct file *file);
static void *afs_proc_sysname_start(struct seq_file *p, loff_t *pos); static void *afs_proc_sysname_start(struct seq_file *p, loff_t *pos);
static void *afs_proc_sysname_next(struct seq_file *p, void *v, static void *afs_proc_sysname_next(struct seq_file *p, void *v,
loff_t *pos); loff_t *pos);
static void afs_proc_sysname_stop(struct seq_file *p, void *v); static void afs_proc_sysname_stop(struct seq_file *p, void *v);
static int afs_proc_sysname_show(struct seq_file *m, void *v); static int afs_proc_sysname_show(struct seq_file *m, void *v);
static ssize_t afs_proc_sysname_write(struct file *file,
const char __user *buf,
size_t size, loff_t *_pos);
static const struct seq_operations afs_proc_sysname_ops = { static const struct seq_operations afs_proc_sysname_ops = {
.start = afs_proc_sysname_start, .start = afs_proc_sysname_start,
...@@ -119,22 +91,6 @@ static const struct seq_operations afs_proc_sysname_ops = { ...@@ -119,22 +91,6 @@ static const struct seq_operations afs_proc_sysname_ops = {
.show = afs_proc_sysname_show, .show = afs_proc_sysname_show,
}; };
static const struct file_operations afs_proc_sysname_fops = {
.open = afs_proc_sysname_open,
.read = seq_read,
.llseek = seq_lseek,
.release = afs_proc_sysname_release,
.write = afs_proc_sysname_write,
};
/*
* open "/proc/fs/afs/cells" which provides a summary of extant cells
*/
static int afs_proc_cells_open(struct inode *inode, struct file *file)
{
return seq_open(file, &afs_proc_cells_ops);
}
/* /*
* set up the iterator to start reading from the cells list and return the * set up the iterator to start reading from the cells list and return the
* first item * first item
...@@ -261,6 +217,19 @@ static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf, ...@@ -261,6 +217,19 @@ static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf,
goto done; goto done;
} }
static int afs_proc_cells_open(struct inode *inode, struct file *file)
{
return seq_open(file, &afs_proc_cells_ops);
}
static const struct file_operations afs_proc_cells_fops = {
.open = afs_proc_cells_open,
.read = seq_read,
.write = afs_proc_cells_write,
.llseek = seq_lseek,
.release = seq_release,
};
static ssize_t afs_proc_rootcell_read(struct file *file, char __user *buf, static ssize_t afs_proc_rootcell_read(struct file *file, char __user *buf,
size_t size, loff_t *_pos) size_t size, loff_t *_pos)
{ {
...@@ -344,6 +313,12 @@ static ssize_t afs_proc_rootcell_write(struct file *file, ...@@ -344,6 +313,12 @@ static ssize_t afs_proc_rootcell_write(struct file *file,
return ret; return ret;
} }
static const struct file_operations afs_proc_rootcell_fops = {
.read = afs_proc_rootcell_read,
.write = afs_proc_rootcell_write,
.llseek = no_llseek,
};
/* /*
* set up the iterator to start reading from the cells list and return the * set up the iterator to start reading from the cells list and return the
* first item * first item
...@@ -731,6 +706,14 @@ static int afs_proc_sysname_show(struct seq_file *m, void *v) ...@@ -731,6 +706,14 @@ static int afs_proc_sysname_show(struct seq_file *m, void *v)
return 0; return 0;
} }
static const struct file_operations afs_proc_sysname_fops = {
.open = afs_proc_sysname_open,
.read = seq_read,
.llseek = seq_lseek,
.release = afs_proc_sysname_release,
.write = afs_proc_sysname_write,
};
/* /*
* Display general per-net namespace statistics * Display general per-net namespace statistics
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment