]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
afs: Need to clear responded flag in addr cursor
authorDavid Howells <dhowells@redhat.com>
Tue, 6 Feb 2018 06:26:30 +0000 (06:26 +0000)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 22 Feb 2018 14:15:55 +0000 (08:15 -0600)
BugLink: http://bugs.launchpad.net/bugs/1751064
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 <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
fs/afs/rotate.c

index d04511fb3879748cf7e6e98c5c53a807f90007ba..0c0f07d34de2a13ef3d097d93df8e274d9e18cee 100644 (file)
@@ -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(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: