Commit 8305e579 authored by David Howells's avatar David Howells

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: d2ddc776 ("afs: Overhaul volume and server record caching and fileserver rotation")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: stable@vger.kernel.org
parent fe4d774c
...@@ -384,6 +384,7 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -384,6 +384,7 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
afs_get_addrlist(alist); afs_get_addrlist(alist);
read_unlock(&server->fs_lock); read_unlock(&server->fs_lock);
memset(&fc->ac, 0, sizeof(fc->ac));
/* Probe the current fileserver if we haven't done so yet. */ /* Probe the current fileserver if we haven't done so yet. */
if (!test_bit(AFS_SERVER_FL_PROBED, &server->flags)) { if (!test_bit(AFS_SERVER_FL_PROBED, &server->flags)) {
...@@ -398,11 +399,8 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -398,11 +399,8 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
else else
afs_put_addrlist(alist); afs_put_addrlist(alist);
fc->ac.addr = NULL;
fc->ac.start = READ_ONCE(alist->index); fc->ac.start = READ_ONCE(alist->index);
fc->ac.index = fc->ac.start; fc->ac.index = fc->ac.start;
fc->ac.error = 0;
fc->ac.begun = false;
goto iterate_address; goto iterate_address;
iterate_address: iterate_address:
...@@ -458,12 +456,10 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) ...@@ -458,12 +456,10 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc)
return false; return false;
} }
memset(&fc->ac, 0, sizeof(fc->ac));
fc->ac.alist = alist; fc->ac.alist = alist;
fc->ac.addr = NULL;
fc->ac.start = READ_ONCE(alist->index); fc->ac.start = READ_ONCE(alist->index);
fc->ac.index = fc->ac.start; fc->ac.index = fc->ac.start;
fc->ac.error = 0;
fc->ac.begun = false;
goto iterate_address; goto iterate_address;
case 0: case 0:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment