afs: Don't assert on unpurgeable server records

[ Upstream commit 7530d3eb3dcf1a30750e8e7f1f88b782b96b72b8 ]

Don't give an assertion failure on unpurgeable afs_server records - which
kills the thread - but rather emit a trace line when we are purging a
record (which only happens during network namespace removal or rmmod) and
print a notice of the problem.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/afs/server.c b/fs/afs/server.c
index e82e452e26124e2908892eb12716657f3abb6baf..684a2b02b9ff70ae056aab6a3807f624bb26c47a 100644 (file)
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -550,7 +550,12 @@ void afs_manage_servers(struct work_struct *work)
 
                _debug("manage %pU %u", &server->uuid, active);
 
-               ASSERTIFCMP(purging, active, ==, 0);
+               if (purging) {
+                       trace_afs_server(server, atomic_read(&server->ref),
+                                        active, afs_server_trace_purging);
+                       if (active != 0)
+                               pr_notice("Can't purge s=%08x\n", server->debug_id);
+               }
 
                if (active == 0) {
                        time64_t expire_at = server->unuse_time;

diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h
index 13c05e28c0b6cfb3a97460cf70489f65c1487565..342b35fc33c59850b489344f268394eafee4f69e 100644 (file)
--- a/include/trace/events/afs.h
+++ b/include/trace/events/afs.h
@@ -40,6 +40,7 @@ enum afs_server_trace {
        afs_server_trace_get_new_cbi,
        afs_server_trace_get_probe,
        afs_server_trace_give_up_cb,
+       afs_server_trace_purging,
        afs_server_trace_put_call,
        afs_server_trace_put_cbi,
        afs_server_trace_put_find_rsq,
@@ -270,6 +271,7 @@ enum afs_cb_break_reason {
        EM(afs_server_trace_get_new_cbi,        "GET cbi  ") \
        EM(afs_server_trace_get_probe,          "GET probe") \
        EM(afs_server_trace_give_up_cb,         "giveup-cb") \
+       EM(afs_server_trace_purging,            "PURGE    ") \
        EM(afs_server_trace_put_call,           "PUT call ") \
        EM(afs_server_trace_put_cbi,            "PUT cbi  ") \
        EM(afs_server_trace_put_find_rsq,       "PUT f-rsq") \