NFS: Report the stateid + status in trace_nfs4_layoutreturn_on_close()

Trond Myklebust · Trond Myklebust · commit a19b4785d9ee · 2020-08-05T07:26:42.000-04:00
Ensure we correctly report the stateid and status in the layoutreturn on
close tracepoint.

Signed-off-by: Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
@@ -1993,7 +1993,7 @@ TRACE_EVENT(nfs4_layoutget,
 
 DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutcommit);
 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_NO_PNFS);
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
@@ -1549,12 +1549,12 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,
 	default:
 		arg_stateid = &args->stateid;
 	}
+	trace_nfs4_layoutreturn_on_close(args->inode, &args->stateid, ret);
 	pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range,
 			res_stateid);
 	if (ld_private && ld_private->ops && ld_private->ops->free)
 		ld_private->ops->free(ld_private);
 	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)

Original file line number	Diff line number	Diff line change
`@@ -1549,12 +1549,12 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,`
`1549`	`1549`	`default:`
`1550`	`1550`	`arg_stateid = &args->stateid;`
`1551`	`1551`	`}`
	`1552`	`+ trace_nfs4_layoutreturn_on_close(args->inode, &args->stateid, ret);`
`1552`	`1553`	`pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range,`
`1553`	`1554`	`res_stateid);`
`1554`	`1555`	`if (ld_private && ld_private->ops && ld_private->ops->free)`
`1555`	`1556`	`ld_private->ops->free(ld_private);`
`1556`	`1557`	`pnfs_put_layout_hdr(lo);`
`1557`		`- trace_nfs4_layoutreturn_on_close(args->inode, 0);`
`1558`	`1558`	`}`
`1559`	`1559`
`1560`	`1560`	`bool pnfs_wait_on_layoutreturn(struct inode ino, struct rpc_task task)`