|
@@ -4119,8 +4119,7 @@ nfsd4_encode_getdeviceinfo(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
struct nfsd4_getdeviceinfo *gdev)
|
|
|
{
|
|
|
struct xdr_stream *xdr = &resp->xdr;
|
|
|
- const struct nfsd4_layout_ops *ops =
|
|
|
- nfsd4_layout_ops[gdev->gd_layout_type];
|
|
|
+ const struct nfsd4_layout_ops *ops;
|
|
|
u32 starting_len = xdr->buf->len, needed_len;
|
|
|
__be32 *p;
|
|
|
|
|
@@ -4137,6 +4136,7 @@ nfsd4_encode_getdeviceinfo(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
|
|
|
/* If maxcount is 0 then just update notifications */
|
|
|
if (gdev->gd_maxcount != 0) {
|
|
|
+ ops = nfsd4_layout_ops[gdev->gd_layout_type];
|
|
|
nfserr = ops->encode_getdeviceinfo(xdr, gdev);
|
|
|
if (nfserr) {
|
|
|
/*
|
|
@@ -4189,8 +4189,7 @@ nfsd4_encode_layoutget(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
struct nfsd4_layoutget *lgp)
|
|
|
{
|
|
|
struct xdr_stream *xdr = &resp->xdr;
|
|
|
- const struct nfsd4_layout_ops *ops =
|
|
|
- nfsd4_layout_ops[lgp->lg_layout_type];
|
|
|
+ const struct nfsd4_layout_ops *ops;
|
|
|
__be32 *p;
|
|
|
|
|
|
dprintk("%s: err %d\n", __func__, nfserr);
|
|
@@ -4213,6 +4212,7 @@ nfsd4_encode_layoutget(struct nfsd4_compoundres *resp, __be32 nfserr,
|
|
|
*p++ = cpu_to_be32(lgp->lg_seg.iomode);
|
|
|
*p++ = cpu_to_be32(lgp->lg_layout_type);
|
|
|
|
|
|
+ ops = nfsd4_layout_ops[lgp->lg_layout_type];
|
|
|
nfserr = ops->encode_layoutget(xdr, lgp);
|
|
|
out:
|
|
|
kfree(lgp->lg_content);
|