SUNRPC: Remove RQ_SPLICE_OK

This flag is no longer used.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index b10f987509cc8007c508e93def6fdcd8b3a4ab72..544fcfe07479959ee5570b111c66b85176314237 100644 (file)
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -260,8 +260,6 @@ enum {
        RQ_LOCAL,               /* local request */
        RQ_USEDEFERRAL,         /* use deferral */
        RQ_DROPME,              /* drop current reply */
-       RQ_SPLICE_OK,           /* turned off in gss privacy to prevent
-                                * encrypting page cache pages */
        RQ_VICTIM,              /* Have agreed to shut down */
        RQ_DATA,                /* request has data */
 };

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 337c90787fb1a960a268f1e08858b49789c7e1bd..cdd3a45e6003aa5791932261757d32f1287747de 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1675,7 +1675,6 @@ DEFINE_SVCXDRBUF_EVENT(sendto);
        svc_rqst_flag(LOCAL)                                            \
        svc_rqst_flag(USEDEFERRAL)                                      \
        svc_rqst_flag(DROPME)                                           \
-       svc_rqst_flag(SPLICE_OK)                                        \
        svc_rqst_flag(VICTIM)                                           \
        svc_rqst_flag_end(DATA)
 

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 104d9a32014263c045a7d9d06efa1e20cb4d3f71..24de9418470036c8af8053472c4557836c369362 100644 (file)
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -866,14 +866,6 @@ svcauth_gss_unwrap_integ(struct svc_rqst *rqstp, u32 seq, struct gss_ctx *ctx)
        struct xdr_buf databody_integ;
        struct xdr_netobj checksum;
 
-       /* NFS READ normally uses splice to send data in-place. However
-        * the data in cache can change after the reply's MIC is computed
-        * but before the RPC reply is sent. To prevent the client from
-        * rejecting the server-computed MIC in this somewhat rare case,
-        * do not use splice with the GSS integrity service.
-        */
-       clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
-
        /* Did we already verify the signature on the original pass through? */
        if (rqstp->rq_deferred)
                return 0;
@@ -948,8 +940,6 @@ svcauth_gss_unwrap_priv(struct svc_rqst *rqstp, u32 seq, struct gss_ctx *ctx)
        struct xdr_buf *buf = xdr->buf;
        unsigned int saved_len;
 
-       clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
-
        if (xdr_stream_decode_u32(xdr, &len) < 0)
                goto unwrap_failed;
        if (rqstp->rq_deferred) {

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 3f2ea7a0496fdc520a498fe9dd3af0eafcc75c98..fa4e23fa0e0911b21286741fad297901c9b71062 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1305,8 +1305,6 @@ svc_process_common(struct svc_rqst *rqstp)
        int                     rc;
        __be32                  *p;
 
-       /* Will be turned off by GSS integrity and privacy services */
-       set_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
        /* Will be turned off only when NFSv4 Sessions are used */
        set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);
        clear_bit(RQ_DROPME, &rqstp->rq_flags);