nfs4trace: fix state manager flag printing

[ Upstream commit b46d80bd2d6e7e063c625a20de54248afe8d4889 ]

__print_flags wants a mask, not the enum value.  Add two more flags.

Fixes: 511ba52e4c01 ("NFS4: Trace state recovery operation")
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 2cff590..3fa77ad 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -292,32 +292,34 @@ TRACE_DEFINE_ENUM(NFS4CLNT_MOVED);
 TRACE_DEFINE_ENUM(NFS4CLNT_LEASE_MOVED);
 TRACE_DEFINE_ENUM(NFS4CLNT_DELEGATION_EXPIRED);
 TRACE_DEFINE_ENUM(NFS4CLNT_RUN_MANAGER);
+TRACE_DEFINE_ENUM(NFS4CLNT_MANAGER_AVAILABLE);
 TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_RUNNING);
 TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_ANY_LAYOUT_READ);
 TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_ANY_LAYOUT_RW);
+TRACE_DEFINE_ENUM(NFS4CLNT_DELEGRETURN_DELAYED);
 
 #define show_nfs4_clp_state(state) \
        __print_flags(state, "|", \
-               { NFS4CLNT_MANAGER_RUNNING,     "MANAGER_RUNNING" }, \
-               { NFS4CLNT_CHECK_LEASE,         "CHECK_LEASE" }, \
-               { NFS4CLNT_LEASE_EXPIRED,       "LEASE_EXPIRED" }, \
-               { NFS4CLNT_RECLAIM_REBOOT,      "RECLAIM_REBOOT" }, \
-               { NFS4CLNT_RECLAIM_NOGRACE,     "RECLAIM_NOGRACE" }, \
-               { NFS4CLNT_DELEGRETURN,         "DELEGRETURN" }, \
-               { NFS4CLNT_SESSION_RESET,       "SESSION_RESET" }, \
-               { NFS4CLNT_LEASE_CONFIRM,       "LEASE_CONFIRM" }, \
-               { NFS4CLNT_SERVER_SCOPE_MISMATCH, \
-                                               "SERVER_SCOPE_MISMATCH" }, \
-               { NFS4CLNT_PURGE_STATE,         "PURGE_STATE" }, \
-               { NFS4CLNT_BIND_CONN_TO_SESSION, \
-                                               "BIND_CONN_TO_SESSION" }, \
-               { NFS4CLNT_MOVED,               "MOVED" }, \
-               { NFS4CLNT_LEASE_MOVED,         "LEASE_MOVED" }, \
-               { NFS4CLNT_DELEGATION_EXPIRED,  "DELEGATION_EXPIRED" }, \
-               { NFS4CLNT_RUN_MANAGER,         "RUN_MANAGER" }, \
-               { NFS4CLNT_RECALL_RUNNING,      "RECALL_RUNNING" }, \
-               { NFS4CLNT_RECALL_ANY_LAYOUT_READ, "RECALL_ANY_LAYOUT_READ" }, \
-               { NFS4CLNT_RECALL_ANY_LAYOUT_RW, "RECALL_ANY_LAYOUT_RW" })
+       { BIT(NFS4CLNT_MANAGER_RUNNING),        "MANAGER_RUNNING" }, \
+       { BIT(NFS4CLNT_CHECK_LEASE),            "CHECK_LEASE" }, \
+       { BIT(NFS4CLNT_LEASE_EXPIRED),  "LEASE_EXPIRED" }, \
+       { BIT(NFS4CLNT_RECLAIM_REBOOT), "RECLAIM_REBOOT" }, \
+       { BIT(NFS4CLNT_RECLAIM_NOGRACE),        "RECLAIM_NOGRACE" }, \
+       { BIT(NFS4CLNT_DELEGRETURN),            "DELEGRETURN" }, \
+       { BIT(NFS4CLNT_SESSION_RESET),  "SESSION_RESET" }, \
+       { BIT(NFS4CLNT_LEASE_CONFIRM),  "LEASE_CONFIRM" }, \
+       { BIT(NFS4CLNT_SERVER_SCOPE_MISMATCH),  "SERVER_SCOPE_MISMATCH" }, \
+       { BIT(NFS4CLNT_PURGE_STATE),            "PURGE_STATE" }, \
+       { BIT(NFS4CLNT_BIND_CONN_TO_SESSION),   "BIND_CONN_TO_SESSION" }, \
+       { BIT(NFS4CLNT_MOVED),          "MOVED" }, \
+       { BIT(NFS4CLNT_LEASE_MOVED),            "LEASE_MOVED" }, \
+       { BIT(NFS4CLNT_DELEGATION_EXPIRED),     "DELEGATION_EXPIRED" }, \
+       { BIT(NFS4CLNT_RUN_MANAGER),            "RUN_MANAGER" }, \
+       { BIT(NFS4CLNT_MANAGER_AVAILABLE), "MANAGER_AVAILABLE" }, \
+       { BIT(NFS4CLNT_RECALL_RUNNING), "RECALL_RUNNING" }, \
+       { BIT(NFS4CLNT_RECALL_ANY_LAYOUT_READ), "RECALL_ANY_LAYOUT_READ" }, \
+       { BIT(NFS4CLNT_RECALL_ANY_LAYOUT_RW), "RECALL_ANY_LAYOUT_RW" }, \
+       { BIT(NFS4CLNT_DELEGRETURN_DELAYED), "DELERETURN_DELAYED" })
 
 TRACE_EVENT(nfs4_state_mgr,
                TP_PROTO(