diff options
-rw-r--r-- | fs/nfs/mount_clnt.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c index 618d815c3093..38ef9eaec407 100644 --- a/fs/nfs/mount_clnt.c +++ b/fs/nfs/mount_clnt.c | |||
@@ -238,18 +238,6 @@ static int mnt_enc_dirpath(struct rpc_rqst *req, __be32 *p, | |||
238 | return encode_mntdirpath(&xdr, dirpath); | 238 | return encode_mntdirpath(&xdr, dirpath); |
239 | } | 239 | } |
240 | 240 | ||
241 | static int xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p, | ||
242 | struct mnt_fhstatus *res) | ||
243 | { | ||
244 | struct nfs_fh *fh = res->fh; | ||
245 | |||
246 | if ((res->status = ntohl(*p++)) == 0) { | ||
247 | fh->size = NFS2_FHSIZE; | ||
248 | memcpy(fh->data, p, NFS2_FHSIZE); | ||
249 | } | ||
250 | return 0; | ||
251 | } | ||
252 | |||
253 | /* | 241 | /* |
254 | * RFC 1094: "A non-zero status indicates some sort of error. In this | 242 | * RFC 1094: "A non-zero status indicates some sort of error. In this |
255 | * case, the status is a UNIX error number." This can be problematic | 243 | * case, the status is a UNIX error number." This can be problematic |
@@ -409,23 +397,6 @@ static int mnt_dec_mountres3(struct rpc_rqst *req, __be32 *p, | |||
409 | return decode_auth_flavors(&xdr, res); | 397 | return decode_auth_flavors(&xdr, res); |
410 | } | 398 | } |
411 | 399 | ||
412 | static int xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, | ||
413 | struct mnt_fhstatus *res) | ||
414 | { | ||
415 | struct nfs_fh *fh = res->fh; | ||
416 | unsigned size; | ||
417 | |||
418 | if ((res->status = ntohl(*p++)) == 0) { | ||
419 | size = ntohl(*p++); | ||
420 | if (size <= NFS3_FHSIZE && size != 0) { | ||
421 | fh->size = size; | ||
422 | memcpy(fh->data, p, size); | ||
423 | } else | ||
424 | res->status = -EBADHANDLE; | ||
425 | } | ||
426 | return 0; | ||
427 | } | ||
428 | |||
429 | static struct rpc_procinfo mnt_procedures[] = { | 400 | static struct rpc_procinfo mnt_procedures[] = { |
430 | [MOUNTPROC_MNT] = { | 401 | [MOUNTPROC_MNT] = { |
431 | .p_proc = MOUNTPROC_MNT, | 402 | .p_proc = MOUNTPROC_MNT, |