Skip to content

L
linux
Commit f0691689 authored by David Howells's avatar David Howells
Browse files
Options

afs: Rearrange fs/afs/proc.c to move the show routines up 

Rearrange fs/afs/proc.c to move the show routines up to the top of each
block so the order is show, iteration, ops, file ops, fops.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 22ade7e7
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 75 deletions
fs/afs/proc.c
View file @ f0691689
...@@ -91,6 +91,25 @@ static const struct seq_operations afs_proc_sysname_ops = { ...@@ -91,6 +91,25 @@ static const struct seq_operations afs_proc_sysname_ops = {
.show = afs_proc_sysname_show, .show = afs_proc_sysname_show,
}; };
/*
* display a header line followed by a load of cell lines
*/
static int afs_proc_cells_show(struct seq_file *m, void *v)
{
struct afs_cell *cell = list_entry(v, struct afs_cell, proc_link);
struct afs_net *net = afs_seq2net(m);
if (v == &net->proc_cells) {
/* display header on line 1 */
seq_puts(m, "USE NAME\n");
return 0;
}
/* display one cell per line on subsequent lines */
seq_printf(m, "%3u %s\n", atomic_read(&cell->usage), cell->name);
return 0;
}
/* /*
* 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
...@@ -123,25 +142,6 @@ static void afs_proc_cells_stop(struct seq_file *m, void *v) ...@@ -123,25 +142,6 @@ static void afs_proc_cells_stop(struct seq_file *m, void *v)
rcu_read_unlock(); rcu_read_unlock();
} }
/*
* display a header line followed by a load of cell lines
*/
static int afs_proc_cells_show(struct seq_file *m, void *v)
{
struct afs_cell *cell = list_entry(v, struct afs_cell, proc_link);
struct afs_net *net = afs_seq2net(m);
if (v == &net->proc_cells) {
/* display header on line 1 */
seq_puts(m, "USE NAME\n");
return 0;
}
/* display one cell per line on subsequent lines */
seq_printf(m, "%3u %s\n", atomic_read(&cell->usage), cell->name);
return 0;
}
/* /*
* handle writes to /proc/fs/afs/cells * handle writes to /proc/fs/afs/cells
* - to add cells: echo "add <cellname> <IP>[:<IP>][:<IP>]" * - to add cells: echo "add <cellname> <IP>[:<IP>][:<IP>]"
...@@ -319,6 +319,33 @@ static const struct file_operations afs_proc_rootcell_fops = { ...@@ -319,6 +319,33 @@ static const struct file_operations afs_proc_rootcell_fops = {
.llseek = no_llseek, .llseek = no_llseek,
}; };
static const char afs_vol_types[3][3] = {
[AFSVL_RWVOL] = "RW",
[AFSVL_ROVOL] = "RO",
[AFSVL_BACKVOL] = "BK",
};
/*
* display a header line followed by a load of volume lines
*/
static int afs_proc_cell_volumes_show(struct seq_file *m, void *v)
{
struct afs_cell *cell = PDE_DATA(file_inode(m->file));
struct afs_volume *vol = list_entry(v, struct afs_volume, proc_link);
/* Display header on line 1 */
if (v == &cell->proc_volumes) {
seq_puts(m, "USE VID TY\n");
return 0;
}
seq_printf(m, "%3d %08x %s\n",
atomic_read(&vol->usage), vol->vid,
afs_vol_types[vol->type]);
return 0;
}
/* /*
* 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
...@@ -357,30 +384,21 @@ static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v) ...@@ -357,30 +384,21 @@ static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v)
read_unlock(&cell->proc_lock); read_unlock(&cell->proc_lock);
} }
static const char afs_vol_types[3][3] = {
[AFSVL_RWVOL] = "RW",
[AFSVL_ROVOL] = "RO",
[AFSVL_BACKVOL] = "BK",
};
/* /*
* display a header line followed by a load of volume lines * display a header line followed by a load of volume lines
*/ */
static int afs_proc_cell_volumes_show(struct seq_file *m, void *v) static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v)
{ {
struct afs_cell *cell = PDE_DATA(file_inode(m->file)); struct sockaddr_rxrpc *addr = v;
struct afs_volume *vol = list_entry(v, struct afs_volume, proc_link);
/* Display header on line 1 */ /* display header on line 1 */
if (v == &cell->proc_volumes) { if (v == (void *)1) {
seq_puts(m, "USE VID TY\n"); seq_puts(m, "ADDRESS\n");
return 0; return 0;
} }
seq_printf(m, "%3d %08x %s\n", /* display one cell per line on subsequent lines */
atomic_read(&vol->usage), vol->vid, seq_printf(m, "%pISp\n", &addr->transport);
afs_vol_types[vol->type]);
return 0; return 0;
} }
...@@ -442,18 +460,22 @@ static void afs_proc_cell_vlservers_stop(struct seq_file *p, void *v) ...@@ -442,18 +460,22 @@ static void afs_proc_cell_vlservers_stop(struct seq_file *p, void *v)
/* /*
* display a header line followed by a load of volume lines * display a header line followed by a load of volume lines
*/ */
static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v) static int afs_proc_servers_show(struct seq_file *m, void *v)
{ {
struct sockaddr_rxrpc *addr = v; struct afs_server *server;
struct afs_addr_list *alist;
/* display header on line 1 */ if (v == SEQ_START_TOKEN) {
if (v == (void *)1) { seq_puts(m, "UUID USE ADDR\n");
seq_puts(m, "ADDRESS\n");
return 0; return 0;
} }
/* display one cell per line on subsequent lines */ server = list_entry(v, struct afs_server, proc_link);
seq_printf(m, "%pISp\n", &addr->transport); alist = rcu_dereference(server->addresses);
seq_printf(m, "%pU %3d %pISp\n",
&server->uuid,
atomic_read(&server->usage),
&alist->addrs[alist->index].transport);
return 0; return 0;
} }
...@@ -489,28 +511,6 @@ static void afs_proc_servers_stop(struct seq_file *p, void *v) ...@@ -489,28 +511,6 @@ static void afs_proc_servers_stop(struct seq_file *p, void *v)
rcu_read_unlock(); rcu_read_unlock();
} }
/*
* display a header line followed by a load of volume lines
*/
static int afs_proc_servers_show(struct seq_file *m, void *v)
{
struct afs_server *server;
struct afs_addr_list *alist;
if (v == SEQ_START_TOKEN) {
seq_puts(m, "UUID USE ADDR\n");
return 0;
}
server = list_entry(v, struct afs_server, proc_link);
alist = rcu_dereference(server->addresses);
seq_printf(m, "%pU %3d %pISp\n",
&server->uuid,
atomic_read(&server->usage),
&alist->addrs[alist->index].transport);
return 0;
}
void afs_put_sysnames(struct afs_sysnames *sysnames) void afs_put_sysnames(struct afs_sysnames *sysnames)
{ {
int i; int i;
...@@ -663,6 +663,17 @@ static int afs_proc_sysname_release(struct inode *inode, struct file *file) ...@@ -663,6 +663,17 @@ static int afs_proc_sysname_release(struct inode *inode, struct file *file)
return seq_release(inode, file); return seq_release(inode, file);
} }
static int afs_proc_sysname_show(struct seq_file *m, void *v)
{
struct afs_net *net = afs_seq2net(m);
struct afs_sysnames *sysnames = net->sysnames;
unsigned int i = (unsigned long)v - 1;
if (i < sysnames->nr)
seq_printf(m, "%s\n", sysnames->subs[i]);
return 0;
}
static void *afs_proc_sysname_start(struct seq_file *m, loff_t *pos) static void *afs_proc_sysname_start(struct seq_file *m, loff_t *pos)
__acquires(&net->sysnames_lock) __acquires(&net->sysnames_lock)
{ {
...@@ -695,17 +706,6 @@ static void afs_proc_sysname_stop(struct seq_file *m, void *v) ...@@ -695,17 +706,6 @@ static void afs_proc_sysname_stop(struct seq_file *m, void *v)
read_unlock(&net->sysnames_lock); read_unlock(&net->sysnames_lock);
} }
static int afs_proc_sysname_show(struct seq_file *m, void *v)
{
struct afs_net *net = afs_seq2net(m);
struct afs_sysnames *sysnames = net->sysnames;
unsigned int i = (unsigned long)v - 1;
if (i < sysnames->nr)
seq_printf(m, "%s\n", sysnames->subs[i]);
return 0;
}
static const struct file_operations afs_proc_sysname_fops = { static const struct file_operations afs_proc_sysname_fops = {
.open = afs_proc_sysname_open, .open = afs_proc_sysname_open,
.read = seq_read, .read = seq_read,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7