3 files changed, 11 insertions, 4 deletions

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 468be1e0dffb..8de04b29bec1 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -396,6 +396,7 @@ struct afs_server {
 #define AFS_SERVER_FL_PROBED    5               /* The fileserver has been probed */
 #define AFS_SERVER_FL_PROBING   6               /* Fileserver is being probed */
 #define AFS_SERVER_FL_NO_IBULK  7               /* Fileserver doesn't support FS.InlineBulkStatus */
+#define AFS_SERVER_FL_MAY_HAVE_CB 8             /* May have callbacks on this fileserver */
         atomic_t                usage;
         u32                     addr_version;   /* Address list version */
 
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index 5c6263972ec9..1f6235a6e9ae 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -482,8 +482,12 @@ static void afs_deliver_to_call(struct afs_call *call)
                 state = READ_ONCE(call->state);
                 switch (ret) {
                 case 0:
-                        if (state == AFS_CALL_CL_PROC_REPLY)
+                        if (state == AFS_CALL_CL_PROC_REPLY) {
+                                if (call->cbi)
+                                        set_bit(AFS_SERVER_FL_MAY_HAVE_CB,
+                                                &call->cbi->server->flags);
                                 goto call_complete;
+                        }
                         ASSERTCMP(state, >, AFS_CALL_CL_PROC_REPLY);
                         goto done;
                 case -EINPROGRESS:
diff --git a/fs/afs/server.c b/fs/afs/server.c
index 629c74986cff..2c5cff60e34d 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -395,14 +395,16 @@ static void afs_destroy_server(struct afs_net *net, struct afs_server *server)
         struct afs_addr_list *alist = rcu_access_pointer(server->addresses);
         struct afs_addr_cursor ac = {
                 .alist  = alist,
-                .addr   = &alist->addrs[0],
                 .start  = alist->index,
-                .index  = alist->index,
+                .index  = 0,
+                .addr   = &alist->addrs[alist->index],
                 .error  = 0,
         };
         _enter("%p", server);
 
-        afs_fs_give_up_all_callbacks(net, server, &ac, NULL);
+        if (test_bit(AFS_SERVER_FL_MAY_HAVE_CB, &server->flags))
+                afs_fs_give_up_all_callbacks(net, server, &ac, NULL);
+
         call_rcu(&server->rcu, afs_server_rcu);
         afs_dec_servers_outstanding(net);
 }