Skip to content

Commit ca57f02

Browse files
dhowellstorvalds
authored andcommitted
afs: Fix fileserver probe RTT handling
The fileserver probing code attempts to work out the best fileserver to use for a volume by retrieving the RTT calculated by AF_RXRPC for the probe call sent to each server and comparing them. Sometimes, however, no RTT estimate is available and rxrpc_kernel_get_srtt() returns false, leading good fileservers to be given an RTT of UINT_MAX and thus causing the rotation algorithm to ignore them. Fix afs_select_fileserver() to ignore rxrpc_kernel_get_srtt()'s return value and just take the estimated RTT it provides - which will be capped at 1 second. Fixes: 1d4adfa ("rxrpc: Make rxrpc_kernel_get_srtt() indicate validity") Signed-off-by: David Howells <[email protected]> Reviewed-by: Marc Dionne <[email protected]> Tested-by: Marc Dionne <[email protected]> cc: [email protected] Link: https://lore.kernel.org/r/166965503999.3392585.13954054113218099395.stgit@warthog.procyon.org.uk/ Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4009166 commit ca57f02

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/afs/fs_probe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ void afs_fileserver_probe_result(struct afs_call *call)
167167
clear_bit(AFS_SERVER_FL_HAS_FS64, &server->flags);
168168
}
169169

170-
if (rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us) &&
171-
rtt_us < server->probe.rtt) {
170+
rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us);
171+
if (rtt_us < server->probe.rtt) {
172172
server->probe.rtt = rtt_us;
173173
server->rtt = rtt_us;
174174
alist->preferred = index;

0 commit comments

Comments
 (0)