Skip to content

Commit b46d80b

Browse files
bcodding-rhamschuma-ntap
authored andcommitted
nfs4trace: fix state manager flag printing
__print_flags wants a mask, not the enum value. Add two more flags. Fixes: 511ba52 ("NFS4: Trace state recovery operation") Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
1 parent 2de3d04 commit b46d80b

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

fs/nfs/nfs4trace.h

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -292,32 +292,34 @@ TRACE_DEFINE_ENUM(NFS4CLNT_MOVED);
292292
TRACE_DEFINE_ENUM(NFS4CLNT_LEASE_MOVED);
293293
TRACE_DEFINE_ENUM(NFS4CLNT_DELEGATION_EXPIRED);
294294
TRACE_DEFINE_ENUM(NFS4CLNT_RUN_MANAGER);
295+
TRACE_DEFINE_ENUM(NFS4CLNT_MANAGER_AVAILABLE);
295296
TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_RUNNING);
296297
TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_ANY_LAYOUT_READ);
297298
TRACE_DEFINE_ENUM(NFS4CLNT_RECALL_ANY_LAYOUT_RW);
299+
TRACE_DEFINE_ENUM(NFS4CLNT_DELEGRETURN_DELAYED);
298300

299301
#define show_nfs4_clp_state(state) \
300302
__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" })
321323

322324
TRACE_EVENT(nfs4_state_mgr,
323325
TP_PROTO(

0 commit comments

Comments
 (0)