From aa4917d6e59dc66ccffc8f449ea04f8236dd6ea4 Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 20 Oct 2023 14:12:42 +0100 Subject: [PATCH] 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: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- fs/afs/addr_list.c | 2 +- fs/afs/fs_probe.c | 6 +++--- fs/afs/internal.h | 2 +- fs/afs/proc.c | 2 +- fs/afs/rotate.c | 2 +- fs/afs/vl_probe.c | 4 ++-- fs/afs/vl_rotate.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/afs/addr_list.c b/fs/afs/addr_list.c index 519821f5aedc..b76abf500713 100644 --- a/fs/afs/addr_list.c +++ b/fs/afs/addr_list.c @@ -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++; diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c index 58d28b82571e..fbb91ad775b9 100644 --- a/fs/afs/fs_probe.c +++ b/fs/afs/fs_probe.c @@ -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); @@ -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 || @@ -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; diff --git a/fs/afs/internal.h b/fs/afs/internal.h index ec08b4a7e499..95bb37253cad 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -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)) diff --git a/fs/afs/proc.c b/fs/afs/proc.c index 8a65a06908d2..16d93fa6396f 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c @@ -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), diff --git a/fs/afs/rotate.c b/fs/afs/rotate.c index d420f073300b..13ec8ffa911a 100644 --- a/fs/afs/rotate.c +++ b/fs/afs/rotate.c @@ -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"); } diff --git a/fs/afs/vl_probe.c b/fs/afs/vl_probe.c index 9551aef07cee..44bff3a2a5ac 100644 --- a/fs/afs/vl_probe.c +++ b/fs/afs/vl_probe.c @@ -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 || @@ -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; diff --git a/fs/afs/vl_rotate.c b/fs/afs/vl_rotate.c index 6aaa2e4733ec..01c890b3d18d 100644 --- a/fs/afs/vl_rotate.c +++ b/fs/afs/vl_rotate.c @@ -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"); }