diff options
| author | David Howells <dhowells@redhat.com> | 2023-10-25 17:53:33 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2023-12-24 15:22:53 +0000 |
| commit | aa453becce5d1ae1b94b7fc22f47d7b05d22b14e (patch) | |
| tree | 933b826c996b2688608d7108d04ff03d390b9585 /fs/afs/vl_probe.c | |
| parent | 6f2ff7e89bd05677f4c08fccafcf625ca3e09c1c (diff) | |
afs: Simplify error handling
Simplify error handling a bit by moving it from the afs_addr_cursor struct
to the afs_operation and afs_vl_cursor structs and using the error
prioritisation function for accumulating errors from multiple sources (AFS
tries to rotate between multiple fileservers, some of which may be
inaccessible or in some state of offlinedness).
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Diffstat (limited to 'fs/afs/vl_probe.c')
| -rw-r--r-- | fs/afs/vl_probe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/afs/vl_probe.c b/fs/afs/vl_probe.c index 44bff3a2a5ac..138f5715619d 100644 --- a/fs/afs/vl_probe.c +++ b/fs/afs/vl_probe.c @@ -169,10 +169,11 @@ static bool afs_do_probe_vlserver(struct afs_net *net, call = afs_vl_get_capabilities(net, &ac, key, server, server_index); if (!IS_ERR(call)) { + afs_prioritise_error(_e, call->error, call->abort_code); afs_put_call(call); in_progress = true; } else { - afs_prioritise_error(_e, PTR_ERR(call), ac.abort_code); + afs_prioritise_error(_e, PTR_ERR(call), 0); afs_done_one_vl_probe(server, false); } } @@ -187,12 +188,10 @@ int afs_send_vl_probes(struct afs_net *net, struct key *key, struct afs_vlserver_list *vllist) { struct afs_vlserver *server; - struct afs_error e; + struct afs_error e = {}; bool in_progress = false; int i; - e.error = 0; - e.responded = false; for (i = 0; i < vllist->nr_servers; i++) { server = vllist->servers[i].server; if (test_bit(AFS_VLSERVER_FL_PROBED, &server->flags)) |