diff options
| author | David Howells <dhowells@redhat.com> | 2019-05-07 16:30:34 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-05-15 18:35:53 +0200 |
| commit | ca1cbbdce92bc2bfdc17e4f70ad41f6e6af2d03f (patch) | |
| tree | 2229083e8e8186749c7de607d5d53da169270a17 /fs/afs/proc.c | |
| parent | afs: Fix missing lock when replacing VL server list (diff) | |
| download | linux-ca1cbbdce92bc2bfdc17e4f70ad41f6e6af2d03f.tar.xz linux-ca1cbbdce92bc2bfdc17e4f70ad41f6e6af2d03f.zip | |
afs: Fix afs_cell records to always have a VL server list record
Fix it such that afs_cell records always have a VL server list record
attached, even if it's a dummy one, so that various checks can be removed.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/afs/proc.c')
| -rw-r--r-- | fs/afs/proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/afs/proc.c b/fs/afs/proc.c index be2ee3bbd0a9..371501d28e08 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c @@ -53,7 +53,7 @@ static int afs_proc_cells_show(struct seq_file *m, void *v) seq_printf(m, "%3u %6lld %2u %s\n", atomic_read(&cell->usage), cell->dns_expiry - ktime_get_real_seconds(), - vllist ? vllist->nr_servers : 0, + vllist->nr_servers, cell->name); return 0; } @@ -296,8 +296,8 @@ static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v) if (v == SEQ_START_TOKEN) { seq_printf(m, "# source %s, status %s\n", - dns_record_sources[vllist->source], - dns_lookup_statuses[vllist->status]); + dns_record_sources[vllist ? vllist->source : 0], + dns_lookup_statuses[vllist ? vllist->status : 0]); return 0; } @@ -336,7 +336,7 @@ static void *afs_proc_cell_vlservers_start(struct seq_file *m, loff_t *_pos) if (pos == 0) return SEQ_START_TOKEN; - if (!vllist || pos - 1 >= vllist->nr_servers) + if (pos - 1 >= vllist->nr_servers) return NULL; return &vllist->servers[pos - 1]; |