Browse Source

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
David Howells 7 years ago
parent
commit
8305e579c6
1 changed files with 2 additions and 6 deletions
  1. 2 6
      fs/afs/rotate.c

+ 2 - 6
fs/afs/rotate.c

@@ -384,6 +384,7 @@ use_server:
 	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 @@ use_server:
 	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)
 			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: