Commit a19b4785 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Report the stateid + status in trace_nfs4_layoutreturn_on_close()

Ensure we correctly report the stateid and status in the layoutreturn on
close tracepoint.
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 7de62bc0
...@@ -1993,7 +1993,7 @@ TRACE_EVENT(nfs4_layoutget, ...@@ -1993,7 +1993,7 @@ TRACE_EVENT(nfs4_layoutget,
DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutcommit); DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutcommit);
DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutreturn); DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutreturn);
DEFINE_NFS4_INODE_EVENT(nfs4_layoutreturn_on_close); DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutreturn_on_close);
TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_UNKNOWN); TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_UNKNOWN);
TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_NO_PNFS); TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_NO_PNFS);
......
...@@ -1549,12 +1549,12 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args, ...@@ -1549,12 +1549,12 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,
default: default:
arg_stateid = &args->stateid; arg_stateid = &args->stateid;
} }
trace_nfs4_layoutreturn_on_close(args->inode, &args->stateid, ret);
pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range, pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range,
res_stateid); res_stateid);
if (ld_private && ld_private->ops && ld_private->ops->free) if (ld_private && ld_private->ops && ld_private->ops->free)
ld_private->ops->free(ld_private); ld_private->ops->free(ld_private);
pnfs_put_layout_hdr(lo); pnfs_put_layout_hdr(lo);
trace_nfs4_layoutreturn_on_close(args->inode, 0);
} }
bool pnfs_wait_on_layoutreturn(struct inode *ino, struct rpc_task *task) bool pnfs_wait_on_layoutreturn(struct inode *ino, struct rpc_task *task)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment