tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

nfs4trace: fix state manager flag printing

__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>

authored by

Benjamin Coddington and committed by
Anna Schumaker b46d80bd 2de3d04b

+22 -20
+22 -20
fs/nfs/nfs4trace.h
··· 292 292 TRACE_DEFINE_ENUM(NFS4CLNT_LEASE_MOVED); 293 293 TRACE_DEFINE_ENUM(NFS4CLNT_DELEGATION_EXPIRED); 294 294 TRACE_DEFINE_ENUM(NFS4CLNT_RUN_MANAGER); 295 + TRACE_DEFINE_ENUM(NFS4CLNT_MANAGER_AVAILABLE); 295 296 TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_RUNNING); 296 297 TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_ANY_LAYOUT_READ); 297 298 TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_ANY_LAYOUT_RW); 299 + TRACE_DEFINE_ENUM(NFS4CLNT_DELEGRETURN_DELAYED); 298 300 299 301 #define show_nfs4_clp_state(state) \ 300 302 __print_flags(state, "|", \ 301 - { NFS4CLNT_MANAGER_RUNNING, "MANAGER_RUNNING" }, \ 302 - { NFS4CLNT_CHECK_LEASE, "CHECK_LEASE" }, \ 303 - { NFS4CLNT_LEASE_EXPIRED, "LEASE_EXPIRED" }, \ 304 - { NFS4CLNT_RECLAIM_REBOOT, "RECLAIM_REBOOT" }, \ 305 - { NFS4CLNT_RECLAIM_NOGRACE, "RECLAIM_NOGRACE" }, \ 306 - { NFS4CLNT_DELEGRETURN, "DELEGRETURN" }, \ 307 - { NFS4CLNT_SESSION_RESET, "SESSION_RESET" }, \ 308 - { NFS4CLNT_LEASE_CONFIRM, "LEASE_CONFIRM" }, \ 309 - { NFS4CLNT_SERVER_SCOPE_MISMATCH, \ 310 - "SERVER_SCOPE_MISMATCH" }, \ 311 - { NFS4CLNT_PURGE_STATE, "PURGE_STATE" }, \ 312 - { NFS4CLNT_BIND_CONN_TO_SESSION, \ 313 - "BIND_CONN_TO_SESSION" }, \ 314 - { NFS4CLNT_MOVED, "MOVED" }, \ 315 - { NFS4CLNT_LEASE_MOVED, "LEASE_MOVED" }, \ 316 - { NFS4CLNT_DELEGATION_EXPIRED, "DELEGATION_EXPIRED" }, \ 317 - { NFS4CLNT_RUN_MANAGER, "RUN_MANAGER" }, \ 318 - { NFS4CLNT_RECALL_RUNNING, "RECALL_RUNNING" }, \ 319 - { NFS4CLNT_RECALL_ANY_LAYOUT_READ, "RECALL_ANY_LAYOUT_READ" }, \ 320 - { NFS4CLNT_RECALL_ANY_LAYOUT_RW, "RECALL_ANY_LAYOUT_RW" }) 303 + { BIT(NFS4CLNT_MANAGER_RUNNING), "MANAGER_RUNNING" }, \ 304 + { BIT(NFS4CLNT_CHECK_LEASE), "CHECK_LEASE" }, \ 305 + { BIT(NFS4CLNT_LEASE_EXPIRED), "LEASE_EXPIRED" }, \ 306 + { BIT(NFS4CLNT_RECLAIM_REBOOT), "RECLAIM_REBOOT" }, \ 307 + { BIT(NFS4CLNT_RECLAIM_NOGRACE), "RECLAIM_NOGRACE" }, \ 308 + { BIT(NFS4CLNT_DELEGRETURN), "DELEGRETURN" }, \ 309 + { BIT(NFS4CLNT_SESSION_RESET), "SESSION_RESET" }, \ 310 + { BIT(NFS4CLNT_LEASE_CONFIRM), "LEASE_CONFIRM" }, \ 311 + { BIT(NFS4CLNT_SERVER_SCOPE_MISMATCH), "SERVER_SCOPE_MISMATCH" }, \ 312 + { BIT(NFS4CLNT_PURGE_STATE), "PURGE_STATE" }, \ 313 + { BIT(NFS4CLNT_BIND_CONN_TO_SESSION), "BIND_CONN_TO_SESSION" }, \ 314 + { BIT(NFS4CLNT_MOVED), "MOVED" }, \ 315 + { BIT(NFS4CLNT_LEASE_MOVED), "LEASE_MOVED" }, \ 316 + { BIT(NFS4CLNT_DELEGATION_EXPIRED), "DELEGATION_EXPIRED" }, \ 317 + { BIT(NFS4CLNT_RUN_MANAGER), "RUN_MANAGER" }, \ 318 + { BIT(NFS4CLNT_MANAGER_AVAILABLE), "MANAGER_AVAILABLE" }, \ 319 + { BIT(NFS4CLNT_RECALL_RUNNING), "RECALL_RUNNING" }, \ 320 + { BIT(NFS4CLNT_RECALL_ANY_LAYOUT_READ), "RECALL_ANY_LAYOUT_READ" }, \ 321 + { BIT(NFS4CLNT_RECALL_ANY_LAYOUT_RW), "RECALL_ANY_LAYOUT_RW" }, \ 322 + { BIT(NFS4CLNT_DELEGRETURN_DELAYED), "DELERETURN_DELAYED" }) 321 323 322 324 TRACE_EVENT(nfs4_state_mgr, 323 325 TP_PROTO(