NFS: Clean up decode_layoutrecall_args() (c79d56d2) · Commits · 戴 / test

fs/nfs/callback_xdr.c

+11 −27

Original line number	Diff line number	Diff line
		@@ -227,10 +227,8 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,
		uint32_t iomode;

		p = read_buf(xdr, 4 * sizeof(uint32_t));
		if (unlikely(p == NULL)) {
		status = htonl(NFS4ERR_BADXDR);
		goto out;
		}
		if (unlikely(p == NULL))
		return htonl(NFS4ERR_BADXDR);

		args->cbl_layout_type = ntohl(*p++);
		/* Depite the spec's xdr, iomode really belongs in the FILE switch,
		@@ -244,37 +242,23 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,
		args->cbl_range.iomode = iomode;
		status = decode_fh(xdr, &args->cbl_fh);
		if (unlikely(status != 0))
		goto out;
		return status;

		p = read_buf(xdr, 2 * sizeof(uint64_t));
		if (unlikely(p == NULL)) {
		status = htonl(NFS4ERR_BADXDR);
		goto out;
		}
		if (unlikely(p == NULL))
		return htonl(NFS4ERR_BADXDR);
		p = xdr_decode_hyper(p, &args->cbl_range.offset);
		p = xdr_decode_hyper(p, &args->cbl_range.length);
		status = decode_layout_stateid(xdr, &args->cbl_stateid);
		if (unlikely(status != 0))
		goto out;
		return decode_layout_stateid(xdr, &args->cbl_stateid);
		} else if (args->cbl_recall_type == RETURN_FSID) {
		p = read_buf(xdr, 2 * sizeof(uint64_t));
		if (unlikely(p == NULL)) {
		status = htonl(NFS4ERR_BADXDR);
		goto out;
		}
		if (unlikely(p == NULL))
		return htonl(NFS4ERR_BADXDR);
		p = xdr_decode_hyper(p, &args->cbl_fsid.major);
		p = xdr_decode_hyper(p, &args->cbl_fsid.minor);
		} else if (args->cbl_recall_type != RETURN_ALL) {
		status = htonl(NFS4ERR_BADXDR);
		goto out;
		}
		dprintk("%s: ltype 0x%x iomode %d changed %d recall_type %d\n",
		__func__,
		args->cbl_layout_type, iomode,
		args->cbl_layoutchanged, args->cbl_recall_type);
		out:
		dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
		return status;
		} else if (args->cbl_recall_type != RETURN_ALL)
		return htonl(NFS4ERR_BADXDR);
		return 0;
		}

		static

Admin message