NFSD OFFLOAD_CANCEL xdr

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index aa05aa3947e0ec49eb1e840ef8ebdc1be85a1406..0c783232101066e20b76a58a9f7d3670585c8090 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1122,6 +1122,14 @@ out:
        return status;
 }
 
+static __be32
+nfsd4_offload_cancel(struct svc_rqst *rqstp,
+                    struct nfsd4_compound_state *cstate,
+                    union nfsd4_op_u *u)
+{
+       return 0;
+}
+
 static __be32
 nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                struct nfsd4_fallocate *fallocate, int flags)
@@ -2480,6 +2488,12 @@ static const struct nfsd4_operation nfsd4_ops[] = {
                .op_name = "OP_OFFLOAD_STATUS",
                .op_rsize_bop = nfsd4_offload_status_rsize,
        },
+       [OP_OFFLOAD_CANCEL] = {
+               .op_func = nfsd4_offload_cancel,
+               .op_flags = OP_MODIFIES_SOMETHING,
+               .op_name = "OP_OFFLOAD_CANCEL",
+               .op_rsize_bop = nfsd4_only_status_rsize,
+       },
 };
 
 /**

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 67b7e6f19ed6857f15da9c55b3d310995bb31c01..b78280a8af73e41fc4fb89edb05a702639e0dc84 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1880,7 +1880,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = {
        [OP_IO_ADVISE]          = (nfsd4_dec)nfsd4_decode_notsupp,
        [OP_LAYOUTERROR]        = (nfsd4_dec)nfsd4_decode_notsupp,
        [OP_LAYOUTSTATS]        = (nfsd4_dec)nfsd4_decode_notsupp,
-       [OP_OFFLOAD_CANCEL]     = (nfsd4_dec)nfsd4_decode_notsupp,
+       [OP_OFFLOAD_CANCEL]     = (nfsd4_dec)nfsd4_decode_offload_status,
        [OP_OFFLOAD_STATUS]     = (nfsd4_dec)nfsd4_decode_offload_status,
        [OP_READ_PLUS]          = (nfsd4_dec)nfsd4_decode_notsupp,
        [OP_SEEK]               = (nfsd4_dec)nfsd4_decode_seek,