Skip to content

Commit

Permalink
afs: Rename addr_list::failed to probe_failed
Browse files Browse the repository at this point in the history
Rename the failed member of struct addr_list to probe_failed as it's
specifically related to probe failures.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
  • Loading branch information
David Howells committed Dec 24, 2023
1 parent a2aff7b commit aa4917d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion fs/afs/addr_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ bool afs_iterate_addresses(struct afs_addr_cursor *ac)
return false;

set = ac->alist->responded;
failed = ac->alist->failed;
failed = ac->alist->probe_failed;
_enter("%lx-%lx-%lx,%d", set, failed, ac->tried, ac->index);

ac->nr_iterations++;
Expand Down
6 changes: 3 additions & 3 deletions fs/afs/fs_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static void afs_fs_probe_not_done(struct afs_net *net,
if (server->probe.error == 0)
server->probe.error = -ENOMEM;

set_bit(index, &alist->failed);
set_bit(index, &alist->probe_failed);

spin_unlock(&server->probe_lock);
return afs_done_one_fs_probe(net, server);
Expand Down Expand Up @@ -138,7 +138,7 @@ void afs_fileserver_probe_result(struct afs_call *call)
case -ETIME:
default:
clear_bit(index, &alist->responded);
set_bit(index, &alist->failed);
set_bit(index, &alist->probe_failed);
if (!server->probe.responded &&
(server->probe.error == 0 ||
server->probe.error == -ETIMEDOUT ||
Expand All @@ -149,7 +149,7 @@ void afs_fileserver_probe_result(struct afs_call *call)
}

responded:
clear_bit(index, &alist->failed);
clear_bit(index, &alist->probe_failed);

if (call->service_id == YFS_FS_SERVICE) {
server->probe.is_yfs = true;
Expand Down
2 changes: 1 addition & 1 deletion fs/afs/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct afs_addr_list {
unsigned char nr_ipv4; /* Number of IPv4 addresses */
enum dns_record_source source: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 */
struct afs_address addrs[] __counted_by(max_addrs);
#define AFS_MAX_ADDRESSES ((unsigned int)(sizeof(unsigned long) * 8))
Expand Down
2 changes: 1 addition & 1 deletion fs/afs/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ static int afs_proc_servers_show(struct seq_file *m, void *v)
(int)(jiffies - server->probed_at) / HZ,
atomic_read(&server->probe_outstanding));
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++)
seq_printf(m, " [%x] %pISpc%s rtt=%d\n",
i, rxrpc_kernel_remote_addr(alist->addrs[i].peer),
Expand Down
2 changes: 1 addition & 1 deletion fs/afs/rotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ void afs_dump_edestaddrreq(const struct afs_operation *op)
a->nr_ipv4, a->nr_addrs, a->max_addrs,
a->preferred);
pr_notice("FC: - R=%lx F=%lx\n",
a->responded, a->failed);
a->responded, a->probe_failed);
if (a == op->ac.alist)
pr_notice("FC: - current\n");
}
Expand Down
4 changes: 2 additions & 2 deletions fs/afs/vl_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void afs_vlserver_probe_result(struct afs_call *call)
case -ETIME:
default:
clear_bit(index, &alist->responded);
set_bit(index, &alist->failed);
set_bit(index, &alist->probe_failed);
if (!(server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED) &&
(server->probe.error == 0 ||
server->probe.error == -ETIMEDOUT ||
Expand All @@ -102,7 +102,7 @@ void afs_vlserver_probe_result(struct afs_call *call)

responded:
set_bit(index, &alist->responded);
clear_bit(index, &alist->failed);
clear_bit(index, &alist->probe_failed);

if (call->service_id == YFS_VL_SERVICE) {
server->probe.flags |= AFS_VLSERVER_PROBE_IS_YFS;
Expand Down
2 changes: 1 addition & 1 deletion fs/afs/vl_rotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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->preferred);
pr_notice("VC: - R=%lx F=%lx\n",
a->responded, a->failed);
a->responded, a->probe_failed);
if (a == vc->ac.alist)
pr_notice("VC: - current\n");
}
Expand Down

0 comments on commit aa4917d

Please sign in to comment.