4.15-stable review patch.  If anyone has any objections, please let me know.

------------------

From: David Howells <[email protected]>

commit 8305e579c653b127b292fcdce551e930f9560260 upstream.

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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 fs/afs/rotate.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- a/fs/afs/rotate.c
+++ b/fs/afs/rotate.c
@@ -383,6 +383,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)) {
@@ -397,11 +398,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(struc
                        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:


Reply via email to