Merge tag 'nfsd-4.3' of git://linux-nfs.org/~bfields/linux

Pull nfsd updates from Bruce Fields:
 "Nothing major, but:

   - Add Jeff Layton as an nfsd co-maintainer: no change to existing
     practice, just an acknowledgement of the status quo.

   - Two patches ("nfsd: ensure that...") for a race overlooked by the
     state locking rewrite, causing a crash noticed by multiple users.

   - Lots of smaller bugfixes all over from Kinglong Mee.

   - From Jeff, some cleanup of server rpc code in preparation for
     possible shift of nfsd threads to workqueues"

* tag 'nfsd-4.3' of git://linux-nfs.org/~bfields/linux: (52 commits)
  nfsd: deal with DELEGRETURN racing with CB_RECALL
  nfsd: return CLID_INUSE for unexpected SETCLIENTID_CONFIRM case
  nfsd: ensure that delegation stateid hash references are only put once
  nfsd: ensure that the ol stateid hash reference is only put once
  net: sunrpc: fix tracepoint Warning: unknown op '->'
  nfsd: allow more than one laundry job to run at a time
  nfsd: don't WARN/backtrace for invalid container deployment.
  fs: fix fs/locks.c kernel-doc warning
  nfsd: Add Jeff Layton as co-maintainer
  NFSD: Return word2 bitmask if setting security label in OPEN/CREATE
  NFSD: Set the attributes used to store the verifier for EXCLUSIVE4_1
  nfsd: SUPPATTR_EXCLCREAT must be encoded before SECURITY_LABEL.
  nfsd: Fix an FS_LAYOUT_TYPES/LAYOUT_TYPES encode bug
  NFSD: Store parent's stat in a separate value
  nfsd: Fix two typos in comments
  lockd: NLM grace period shouldn't block NFSv4 opens
  nfsd: include linux/nfs4.h in export.h
  sunrpc: Switch to using hash list instead single list
  sunrpc/nfsd: Remove redundant code by exports seq_operations functions
  sunrpc: Store cache_detail in seq_file's private directly
  ...

1 files changed, 14 insertions, 7 deletions

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index fd1a02cb3c82..003dca933803 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -529,18 +529,21 @@ TRACE_EVENT(svc_xprt_do_enqueue,
 
         TP_STRUCT__entry(
                 __field(struct svc_xprt *, xprt)
-                __field(struct svc_rqst *, rqst)
+                __field_struct(struct sockaddr_storage, ss)
+                __field(int, pid)
+                __field(unsigned long, flags)
         ),
 
         TP_fast_assign(
                 __entry->xprt = xprt;
-                __entry->rqst = rqst;
+                xprt ? memcpy(&__entry->ss, &xprt->xpt_remote, sizeof(__entry->ss)) : memset(&__entry->ss, 0, sizeof(__entry->ss));
+                __entry->pid = rqst? rqst->rq_task->pid : 0;
+                __entry->flags = xprt ? xprt->xpt_flags : 0;
         ),
 
         TP_printk("xprt=0x%p addr=%pIScp pid=%d flags=%s", __entry->xprt,
-                (struct sockaddr *)&__entry->xprt->xpt_remote,
-                __entry->rqst ? __entry->rqst->rq_task->pid : 0,
-                show_svc_xprt_flags(__entry->xprt->xpt_flags))
+                (struct sockaddr *)&__entry->ss,
+                __entry->pid, show_svc_xprt_flags(__entry->flags))
 );
 
 TRACE_EVENT(svc_xprt_dequeue,
@@ -589,16 +592,20 @@ TRACE_EVENT(svc_handle_xprt,
         TP_STRUCT__entry(
                 __field(struct svc_xprt *, xprt)
                 __field(int, len)
+                __field_struct(struct sockaddr_storage, ss)
+                __field(unsigned long, flags)
         ),
 
         TP_fast_assign(
                 __entry->xprt = xprt;
+                xprt ? memcpy(&__entry->ss, &xprt->xpt_remote, sizeof(__entry->ss)) : memset(&__entry->ss, 0, sizeof(__entry->ss));
                 __entry->len = len;
+                __entry->flags = xprt ? xprt->xpt_flags : 0;
         ),
 
         TP_printk("xprt=0x%p addr=%pIScp len=%d flags=%s", __entry->xprt,
-                (struct sockaddr *)&__entry->xprt->xpt_remote, __entry->len,
-                show_svc_xprt_flags(__entry->xprt->xpt_flags))
+                (struct sockaddr *)&__entry->ss,
+                __entry->len, show_svc_xprt_flags(__entry->flags))
 );
 #endif /* _TRACE_SUNRPC_H */