sunrpc: move rq_dropme flag into rq_flags

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 6a3cf4c76dce..d4ea3e5246b0 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -255,6 +255,7 @@ struct svc_rqst {
 #define RQ_SECURE       (0)                     /* secure port */
 #define RQ_LOCAL        (1)                     /* local request */
 #define RQ_USEDEFERRAL  (2)                     /* use deferral */
+#define RQ_DROPME       (3)                     /* drop current reply */
         unsigned long           rq_flags;       /* flags field */
 
         void *                  rq_argp;        /* decoded arguments */
@@ -271,7 +272,6 @@ struct svc_rqst {
         struct cache_req        rq_chandle;     /* handle passed to caches for 
                                                  * request delaying 
                                                  */
-        bool                    rq_dropme;
         /* Catering to nfsd */
         struct auth_domain *    rq_client;      /* RPC peer info */
         struct auth_domain *    rq_gssclient;   /* "gss/"-style peer info */
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 6d1facdebc92..355671f19a9f 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -416,7 +416,8 @@ TRACE_EVENT(xs_tcp_data_recv,
         __print_flags(flags, "|",                                       \
                 { (1UL << RQ_SECURE),           "RQ_SECURE"},           \
                 { (1UL << RQ_LOCAL),            "RQ_LOCAL"},            \
-                { (1UL << RQ_USEDEFERRAL),      "RQ_USEDEFERRAL"})
+                { (1UL << RQ_USEDEFERRAL),      "RQ_USEDEFERRAL"},      \
+                { (1UL << RQ_DROPME),           "RQ_DROPME"})
 
 TRACE_EVENT(svc_recv,
         TP_PROTO(struct svc_rqst *rqst, int status),
@@ -459,13 +460,12 @@ DECLARE_EVENT_CLASS(svc_rqst_status,
         TP_fast_assign(
                 __entry->addr = (struct sockaddr *)&rqst->rq_addr;
                 __entry->xid = rqst->rq_xid;
-                __entry->dropme = (int)rqst->rq_dropme;
                 __entry->status = status;
                 __entry->flags = rqst->rq_flags;
         ),
 
-        TP_printk("addr=%pIScp rq_xid=0x%x dropme=%d status=%d flags=%s",
-                __entry->addr, be32_to_cpu(__entry->xid), __entry->dropme,
+        TP_printk("addr=%pIScp rq_xid=0x%x status=%d flags=%s",
+                __entry->addr, be32_to_cpu(__entry->xid),
                 __entry->status, show_rqstp_flags(__entry->flags))
 );