diff options
author | David Howells <dhowells@redhat.com> | 2018-02-06 01:26:30 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2018-02-06 09:36:54 -0500 |
commit | 8305e579c653b127b292fcdce551e930f9560260 (patch) | |
tree | 16fba71ed0e66a45aca2b7c2dc51ab56281c12f2 /fs/afs/rotate.c | |
parent | fe4d774c847398c2a45c10a780ccfde069840793 (diff) |
afs: Need to clear responded flag in addr cursor
In afs_select_fileserver(), we need to clear the ->responded flag in the
address list when reusing it. We should also clear it in
afs_select_current_fileserver().
To this end, just memset() the object before initialising it.
Fixes: d2ddc776a458 ("afs: Overhaul volume and server record caching and fileserver rotation")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: stable@vger.kernel.org
Diffstat (limited to 'fs/afs/rotate.c')
-rw-r--r-- | fs/afs/rotate.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/afs/rotate.c b/fs/afs/rotate.c index b473b25c6978..892a4904fd77 100644 --- a/fs/afs/rotate.c +++ b/fs/afs/rotate.c | |||
@@ -384,6 +384,7 @@ use_server: | |||
384 | afs_get_addrlist(alist); | 384 | afs_get_addrlist(alist); |
385 | read_unlock(&server->fs_lock); | 385 | read_unlock(&server->fs_lock); |
386 | 386 | ||
387 | memset(&fc->ac, 0, sizeof(fc->ac)); | ||
387 | 388 | ||
388 | /* Probe the current fileserver if we haven't done so yet. */ | 389 | /* Probe the current fileserver if we haven't done so yet. */ |
389 | if (!test_bit(AFS_SERVER_FL_PROBED, &server->flags)) { | 390 | if (!test_bit(AFS_SERVER_FL_PROBED, &server->flags)) { |
@@ -398,11 +399,8 @@ use_server: | |||
398 | else | 399 | else |
399 | afs_put_addrlist(alist); | 400 | afs_put_addrlist(alist); |
400 | 401 | ||
401 | fc->ac.addr = NULL; | ||
402 | fc->ac.start = READ_ONCE(alist->index); | 402 | fc->ac.start = READ_ONCE(alist->index); |
403 | fc->ac.index = fc->ac.start; | 403 | fc->ac.index = fc->ac.start; |
404 | fc->ac.error = 0; | ||
405 | fc->ac.begun = false; | ||
406 | goto iterate_address; | 404 | goto iterate_address; |
407 | 405 | ||
408 | iterate_address: | 406 | iterate_address: |
@@ -458,12 +456,10 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) | |||
458 | return false; | 456 | return false; |
459 | } | 457 | } |
460 | 458 | ||
459 | memset(&fc->ac, 0, sizeof(fc->ac)); | ||
461 | fc->ac.alist = alist; | 460 | fc->ac.alist = alist; |
462 | fc->ac.addr = NULL; | ||
463 | fc->ac.start = READ_ONCE(alist->index); | 461 | fc->ac.start = READ_ONCE(alist->index); |
464 | fc->ac.index = fc->ac.start; | 462 | fc->ac.index = fc->ac.start; |
465 | fc->ac.error = 0; | ||
466 | fc->ac.begun = false; | ||
467 | goto iterate_address; | 463 | goto iterate_address; |
468 | 464 | ||
469 | case 0: | 465 | case 0: |