diff options
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index cb9f9017af8f..09204f590355 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
| @@ -1139,24 +1139,6 @@ nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify | |||
| 1139 | DECODE_TAIL; | 1139 | DECODE_TAIL; |
| 1140 | } | 1140 | } |
| 1141 | 1141 | ||
| 1142 | static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write) | ||
| 1143 | { | ||
| 1144 | int i = 1; | ||
| 1145 | int buflen = write->wr_buflen; | ||
| 1146 | |||
| 1147 | vec[0].iov_base = write->wr_head.iov_base; | ||
| 1148 | vec[0].iov_len = min_t(int, buflen, write->wr_head.iov_len); | ||
| 1149 | buflen -= vec[0].iov_len; | ||
| 1150 | |||
| 1151 | while (buflen) { | ||
| 1152 | vec[i].iov_base = page_address(write->wr_pagelist[i - 1]); | ||
| 1153 | vec[i].iov_len = min_t(int, PAGE_SIZE, buflen); | ||
| 1154 | buflen -= vec[i].iov_len; | ||
| 1155 | i++; | ||
| 1156 | } | ||
| 1157 | return i; | ||
| 1158 | } | ||
| 1159 | |||
| 1160 | static __be32 | 1142 | static __be32 |
| 1161 | nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) | 1143 | nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) |
| 1162 | { | 1144 | { |
| @@ -1204,8 +1186,6 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) | |||
| 1204 | argp->end = argp->p + XDR_QUADLEN(PAGE_SIZE); | 1186 | argp->end = argp->p + XDR_QUADLEN(PAGE_SIZE); |
| 1205 | } | 1187 | } |
| 1206 | argp->p += XDR_QUADLEN(len); | 1188 | argp->p += XDR_QUADLEN(len); |
| 1207 | write->wr_vlen = fill_in_write_vector(argp->rqstp->rq_vec, write); | ||
| 1208 | WARN_ON_ONCE(write->wr_vlen > ARRAY_SIZE(argp->rqstp->rq_vec)); | ||
| 1209 | 1189 | ||
| 1210 | DECODE_TAIL; | 1190 | DECODE_TAIL; |
| 1211 | } | 1191 | } |