diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/sunrpc/svc.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/sunrpc/svc.c')
| -rw-r--r-- | net/sunrpc/svc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 5de6801cd924..1db5007ddbce 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
| @@ -1086,9 +1086,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) | |||
| 1086 | goto err_short_len; | 1086 | goto err_short_len; |
| 1087 | 1087 | ||
| 1088 | /* Will be turned off only in gss privacy case: */ | 1088 | /* Will be turned off only in gss privacy case: */ |
| 1089 | rqstp->rq_splice_ok = 1; | 1089 | rqstp->rq_splice_ok = true; |
| 1090 | /* Will be turned off only when NFSv4 Sessions are used */ | 1090 | /* Will be turned off only when NFSv4 Sessions are used */ |
| 1091 | rqstp->rq_usedeferral = 1; | 1091 | rqstp->rq_usedeferral = true; |
| 1092 | rqstp->rq_dropme = false; | 1092 | rqstp->rq_dropme = false; |
| 1093 | 1093 | ||
| 1094 | /* Setup reply header */ | 1094 | /* Setup reply header */ |