NFS4.x/pnfs: Fix up logging of layout stateids

If the layout is invalid, then just log a '0' value.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 2cff5901c6894f209035b2bc812476f03954a555..e3fbdc8a98eb918954fc8af8b3d56aa7feef2e3e 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -1815,7 +1815,7 @@ TRACE_EVENT(pnfs_update_layout,
                        __entry->count = count;
                        __entry->iomode = iomode;
                        __entry->reason = reason;
-                       if (lo != NULL) {
+                       if (lo != NULL && pnfs_layout_is_valid(lo)) {
                                __entry->layoutstateid_seq =
                                be32_to_cpu(lo->plh_stateid.seqid);
                                __entry->layoutstateid_hash =
@@ -1869,7 +1869,7 @@ DECLARE_EVENT_CLASS(pnfs_layout_event,
                        __entry->pos = pos;
                        __entry->count = count;
                        __entry->iomode = iomode;
-                       if (lo != NULL) {
+                       if (lo != NULL && pnfs_layout_is_valid(lo)) {
                                __entry->layoutstateid_seq =
                                be32_to_cpu(lo->plh_stateid.seqid);
                                __entry->layoutstateid_hash =