Commit aa4917d6 authored by David Howells's avatar David Howells

afs: Rename addr_list::failed to probe_failed

Rename the failed member of struct addr_list to probe_failed as it's
specifically related to probe failures.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
parent a2aff7b5
...@@ -367,7 +367,7 @@ bool afs_iterate_addresses(struct afs_addr_cursor *ac) ...@@ -367,7 +367,7 @@ bool afs_iterate_addresses(struct afs_addr_cursor *ac)
return false; return false;
set = ac->alist->responded; set = ac->alist->responded;
failed = ac->alist->failed; failed = ac->alist->probe_failed;
_enter("%lx-%lx-%lx,%d", set, failed, ac->tried, ac->index); _enter("%lx-%lx-%lx,%d", set, failed, ac->tried, ac->index);
ac->nr_iterations++; ac->nr_iterations++;
......
...@@ -88,7 +88,7 @@ static void afs_fs_probe_not_done(struct afs_net *net, ...@@ -88,7 +88,7 @@ static void afs_fs_probe_not_done(struct afs_net *net,
if (server->probe.error == 0) if (server->probe.error == 0)
server->probe.error = -ENOMEM; server->probe.error = -ENOMEM;
set_bit(index, &alist->failed); set_bit(index, &alist->probe_failed);
spin_unlock(&server->probe_lock); spin_unlock(&server->probe_lock);
return afs_done_one_fs_probe(net, server); return afs_done_one_fs_probe(net, server);
...@@ -138,7 +138,7 @@ void afs_fileserver_probe_result(struct afs_call *call) ...@@ -138,7 +138,7 @@ void afs_fileserver_probe_result(struct afs_call *call)
case -ETIME: case -ETIME:
default: default:
clear_bit(index, &alist->responded); clear_bit(index, &alist->responded);
set_bit(index, &alist->failed); set_bit(index, &alist->probe_failed);
if (!server->probe.responded && if (!server->probe.responded &&
(server->probe.error == 0 || (server->probe.error == 0 ||
server->probe.error == -ETIMEDOUT || server->probe.error == -ETIMEDOUT ||
...@@ -149,7 +149,7 @@ void afs_fileserver_probe_result(struct afs_call *call) ...@@ -149,7 +149,7 @@ void afs_fileserver_probe_result(struct afs_call *call)
} }
responded: responded:
clear_bit(index, &alist->failed); clear_bit(index, &alist->probe_failed);
if (call->service_id == YFS_FS_SERVICE) { if (call->service_id == YFS_FS_SERVICE) {
server->probe.is_yfs = true; server->probe.is_yfs = true;
......
...@@ -90,7 +90,7 @@ struct afs_addr_list { ...@@ -90,7 +90,7 @@ struct afs_addr_list {
unsigned char nr_ipv4; /* Number of IPv4 addresses */ unsigned char nr_ipv4; /* Number of IPv4 addresses */
enum dns_record_source source:8; enum dns_record_source source:8;
enum dns_lookup_status status:8; enum dns_lookup_status status:8;
unsigned long failed; /* Mask of addrs that failed locally/ICMP */ unsigned long probe_failed; /* Mask of addrs that failed locally/ICMP */
unsigned long responded; /* Mask of addrs that responded */ unsigned long responded; /* Mask of addrs that responded */
struct afs_address addrs[] __counted_by(max_addrs); struct afs_address addrs[] __counted_by(max_addrs);
#define AFS_MAX_ADDRESSES ((unsigned int)(sizeof(unsigned long) * 8)) #define AFS_MAX_ADDRESSES ((unsigned int)(sizeof(unsigned long) * 8))
......
...@@ -396,7 +396,7 @@ static int afs_proc_servers_show(struct seq_file *m, void *v) ...@@ -396,7 +396,7 @@ static int afs_proc_servers_show(struct seq_file *m, void *v)
(int)(jiffies - server->probed_at) / HZ, (int)(jiffies - server->probed_at) / HZ,
atomic_read(&server->probe_outstanding)); atomic_read(&server->probe_outstanding));
seq_printf(m, " - ALIST v=%u rsp=%lx f=%lx\n", seq_printf(m, " - ALIST v=%u rsp=%lx f=%lx\n",
alist->version, alist->responded, alist->failed); alist->version, alist->responded, alist->probe_failed);
for (i = 0; i < alist->nr_addrs; i++) for (i = 0; i < alist->nr_addrs; i++)
seq_printf(m, " [%x] %pISpc%s rtt=%d\n", seq_printf(m, " [%x] %pISpc%s rtt=%d\n",
i, rxrpc_kernel_remote_addr(alist->addrs[i].peer), i, rxrpc_kernel_remote_addr(alist->addrs[i].peer),
......
...@@ -583,7 +583,7 @@ void afs_dump_edestaddrreq(const struct afs_operation *op) ...@@ -583,7 +583,7 @@ void afs_dump_edestaddrreq(const struct afs_operation *op)
a->nr_ipv4, a->nr_addrs, a->max_addrs, a->nr_ipv4, a->nr_addrs, a->max_addrs,
a->preferred); a->preferred);
pr_notice("FC: - R=%lx F=%lx\n", pr_notice("FC: - R=%lx F=%lx\n",
a->responded, a->failed); a->responded, a->probe_failed);
if (a == op->ac.alist) if (a == op->ac.alist)
pr_notice("FC: - current\n"); pr_notice("FC: - current\n");
} }
......
...@@ -90,7 +90,7 @@ void afs_vlserver_probe_result(struct afs_call *call) ...@@ -90,7 +90,7 @@ void afs_vlserver_probe_result(struct afs_call *call)
case -ETIME: case -ETIME:
default: default:
clear_bit(index, &alist->responded); clear_bit(index, &alist->responded);
set_bit(index, &alist->failed); set_bit(index, &alist->probe_failed);
if (!(server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED) && if (!(server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED) &&
(server->probe.error == 0 || (server->probe.error == 0 ||
server->probe.error == -ETIMEDOUT || server->probe.error == -ETIMEDOUT ||
...@@ -102,7 +102,7 @@ void afs_vlserver_probe_result(struct afs_call *call) ...@@ -102,7 +102,7 @@ void afs_vlserver_probe_result(struct afs_call *call)
responded: responded:
set_bit(index, &alist->responded); set_bit(index, &alist->responded);
clear_bit(index, &alist->failed); clear_bit(index, &alist->probe_failed);
if (call->service_id == YFS_VL_SERVICE) { if (call->service_id == YFS_VL_SERVICE) {
server->probe.flags |= AFS_VLSERVER_PROBE_IS_YFS; server->probe.flags |= AFS_VLSERVER_PROBE_IS_YFS;
......
...@@ -322,7 +322,7 @@ static void afs_vl_dump_edestaddrreq(const struct afs_vl_cursor *vc) ...@@ -322,7 +322,7 @@ static void afs_vl_dump_edestaddrreq(const struct afs_vl_cursor *vc)
a->nr_ipv4, a->nr_addrs, a->max_addrs, a->nr_ipv4, a->nr_addrs, a->max_addrs,
a->preferred); a->preferred);
pr_notice("VC: - R=%lx F=%lx\n", pr_notice("VC: - R=%lx F=%lx\n",
a->responded, a->failed); a->responded, a->probe_failed);
if (a == vc->ac.alist) if (a == vc->ac.alist)
pr_notice("VC: - current\n"); pr_notice("VC: - current\n");
} }
......
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