diff options
| author | David Howells <dhowells@redhat.com> | 2018-02-06 07:26:30 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2018-02-06 15:36:54 +0100 |
| commit | 8305e579c653b127b292fcdce551e930f9560260 (patch) | |
| tree | 16fba71ed0e66a45aca2b7c2dc51ab56281c12f2 /fs/afs | |
| parent | afs: Fix missing cursor clearance (diff) | |
| download | linux-8305e579c653b127b292fcdce551e930f9560260.tar.xz linux-8305e579c653b127b292fcdce551e930f9560260.zip | |
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')
| -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: afs_get_addrlist(alist); read_unlock(&server->fs_lock); + memset(&fc->ac, 0, sizeof(fc->ac)); /* Probe the current fileserver if we haven't done so yet. */ if (!test_bit(AFS_SERVER_FL_PROBED, &server->flags)) { @@ -398,11 +399,8 @@ use_server: else afs_put_addrlist(alist); - fc->ac.addr = NULL; fc->ac.start = READ_ONCE(alist->index); fc->ac.index = fc->ac.start; - fc->ac.error = 0; - fc->ac.begun = false; goto iterate_address; iterate_address: @@ -458,12 +456,10 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) return false; } + memset(&fc->ac, 0, sizeof(fc->ac)); fc->ac.alist = alist; - fc->ac.addr = NULL; fc->ac.start = READ_ONCE(alist->index); fc->ac.index = fc->ac.start; - fc->ac.error = 0; - fc->ac.begun = false; goto iterate_address; case 0: |