Commit 3587b5c7 authored by Chuck Lever's avatar Chuck Lever

SUNRPC: Remove RQ_SPLICE_OK

This flag is no longer used.
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent a2c91753
...@@ -260,8 +260,6 @@ enum { ...@@ -260,8 +260,6 @@ enum {
RQ_LOCAL, /* local request */ RQ_LOCAL, /* local request */
RQ_USEDEFERRAL, /* use deferral */ RQ_USEDEFERRAL, /* use deferral */
RQ_DROPME, /* drop current reply */ 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_VICTIM, /* Have agreed to shut down */
RQ_DATA, /* request has data */ RQ_DATA, /* request has data */
}; };
......
...@@ -1675,7 +1675,6 @@ DEFINE_SVCXDRBUF_EVENT(sendto); ...@@ -1675,7 +1675,6 @@ DEFINE_SVCXDRBUF_EVENT(sendto);
svc_rqst_flag(LOCAL) \ svc_rqst_flag(LOCAL) \
svc_rqst_flag(USEDEFERRAL) \ svc_rqst_flag(USEDEFERRAL) \
svc_rqst_flag(DROPME) \ svc_rqst_flag(DROPME) \
svc_rqst_flag(SPLICE_OK) \
svc_rqst_flag(VICTIM) \ svc_rqst_flag(VICTIM) \
svc_rqst_flag_end(DATA) svc_rqst_flag_end(DATA)
......
...@@ -866,14 +866,6 @@ svcauth_gss_unwrap_integ(struct svc_rqst *rqstp, u32 seq, struct gss_ctx *ctx) ...@@ -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_buf databody_integ;
struct xdr_netobj checksum; 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? */ /* Did we already verify the signature on the original pass through? */
if (rqstp->rq_deferred) if (rqstp->rq_deferred)
return 0; return 0;
...@@ -948,8 +940,6 @@ svcauth_gss_unwrap_priv(struct svc_rqst *rqstp, u32 seq, struct gss_ctx *ctx) ...@@ -948,8 +940,6 @@ svcauth_gss_unwrap_priv(struct svc_rqst *rqstp, u32 seq, struct gss_ctx *ctx)
struct xdr_buf *buf = xdr->buf; struct xdr_buf *buf = xdr->buf;
unsigned int saved_len; unsigned int saved_len;
clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
if (xdr_stream_decode_u32(xdr, &len) < 0) if (xdr_stream_decode_u32(xdr, &len) < 0)
goto unwrap_failed; goto unwrap_failed;
if (rqstp->rq_deferred) { if (rqstp->rq_deferred) {
......
...@@ -1305,8 +1305,6 @@ svc_process_common(struct svc_rqst *rqstp) ...@@ -1305,8 +1305,6 @@ svc_process_common(struct svc_rqst *rqstp)
int rc; int rc;
__be32 *p; __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 */ /* Will be turned off only when NFSv4 Sessions are used */
set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags); set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);
clear_bit(RQ_DROPME, &rqstp->rq_flags); clear_bit(RQ_DROPME, &rqstp->rq_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment