diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-01-07 18:45:36 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-01-07 18:45:36 -0500 |
| commit | daaadd2283eb8bcae3b866592a9a1c807cc60605 (patch) | |
| tree | 7abff6186295207d923f1e9225b9340087696070 /fs/nfs/nfs4trace.h | |
| parent | 210c7c1750fdf769647d1d526c9ea34c412c9eee (diff) | |
| parent | 13331a551ab4df87f7a027d2cab392da96aba1de (diff) | |
Merge branch 'bugfixes'
* bugfixes:
SUNRPC: Fixup socket wait for memory
SUNRPC: Fix a missing break in rpc_anyaddr()
pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh()
NFS: Fix attribute cache revalidation
NFS: Ensure we revalidate attributes before using execute_ok()
NFS: Flush reclaim writes using FLUSH_COND_STABLE
NFS: Background flush should not be low priority
NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturn
NFSv4: Don't perform cached access checks before we've OPENed the file
NFS: Allow the combination pNFS and labeled NFS
NFS42: handle layoutstats stateid error
nfs: Fix race in __update_open_stateid()
nfs: fix missing assignment in nfs4_sequence_done tracepoint
Diffstat (limited to 'fs/nfs/nfs4trace.h')
| -rw-r--r-- | fs/nfs/nfs4trace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index 88b6b14ce71b..2c8d05dae5b1 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -321,6 +321,7 @@ TRACE_EVENT(nfs4_sequence_done, __entry->highest_slotid = res->sr_highest_slotid; __entry->target_highest_slotid = res->sr_target_highest_slotid; + __entry->status_flags = res->sr_status_flags; __entry->error = res->sr_status; ), TP_printk( |