sunrpc: move rq_splice_ok 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, 4 deletions

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index d4ea3e5246b0..2714287fc4f6 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -256,6 +256,9 @@ struct svc_rqst {
 #define RQ_LOCAL        (1)                     /* local request */
 #define RQ_USEDEFERRAL  (2)                     /* use deferral */
 #define RQ_DROPME       (3)                     /* drop current reply */
+#define RQ_SPLICE_OK    (4)                     /* turned off in gss privacy
+                                                 * to prevent encrypting page
+                                                 * cache pages */
         unsigned long           rq_flags;       /* flags field */
 
         void *                  rq_argp;        /* decoded arguments */
@@ -277,9 +280,6 @@ struct svc_rqst {
         struct auth_domain *    rq_gssclient;   /* "gss/"-style peer info */
         int                     rq_cachetype;
         struct svc_cacherep *   rq_cacherep;    /* cache info */
-        bool                    rq_splice_ok;   /* turned off in gss privacy
-                                                 * to prevent encrypting page
-                                                 * cache pages */
         struct task_struct      *rq_task;       /* service thread */
 };
 
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 355671f19a9f..5848fc235869 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -417,7 +417,8 @@ TRACE_EVENT(xs_tcp_data_recv,
                 { (1UL << RQ_SECURE),           "RQ_SECURE"},           \
                 { (1UL << RQ_LOCAL),            "RQ_LOCAL"},            \
                 { (1UL << RQ_USEDEFERRAL),      "RQ_USEDEFERRAL"},      \
-                { (1UL << RQ_DROPME),           "RQ_DROPME"})
+                { (1UL << RQ_DROPME),           "RQ_DROPME"},           \
+                { (1UL << RQ_SPLICE_OK),        "RQ_SPLICE_OK"})
 
 TRACE_EVENT(svc_recv,
         TP_PROTO(struct svc_rqst *rqst, int status),