aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlga Kornievskaia <kolga@netapp.com>2018-07-20 18:19:19 -0400
committerJ. Bruce Fields <bfields@redhat.com>2018-09-25 20:34:54 -0400
commit885e2bf3ea5121975ade0d7866ab6226a8547dc9 (patch)
treedab8b62fcac762b77bc5221daa0e2123c26101dd
parent6308bc98e86ee8c7bbd56a39839a257a16c9378c (diff)
NFSD OFFLOAD_CANCEL xdr
Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4proc.c14
-rw-r--r--fs/nfsd/nfs4xdr.c2
2 files changed, 15 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index aa05aa3947e0..0c7832321010 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1123,6 +1123,14 @@ out:
1123} 1123}
1124 1124
1125static __be32 1125static __be32
1126nfsd4_offload_cancel(struct svc_rqst *rqstp,
1127 struct nfsd4_compound_state *cstate,
1128 union nfsd4_op_u *u)
1129{
1130 return 0;
1131}
1132
1133static __be32
1126nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 1134nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
1127 struct nfsd4_fallocate *fallocate, int flags) 1135 struct nfsd4_fallocate *fallocate, int flags)
1128{ 1136{
@@ -2480,6 +2488,12 @@ static const struct nfsd4_operation nfsd4_ops[] = {
2480 .op_name = "OP_OFFLOAD_STATUS", 2488 .op_name = "OP_OFFLOAD_STATUS",
2481 .op_rsize_bop = nfsd4_offload_status_rsize, 2489 .op_rsize_bop = nfsd4_offload_status_rsize,
2482 }, 2490 },
2491 [OP_OFFLOAD_CANCEL] = {
2492 .op_func = nfsd4_offload_cancel,
2493 .op_flags = OP_MODIFIES_SOMETHING,
2494 .op_name = "OP_OFFLOAD_CANCEL",
2495 .op_rsize_bop = nfsd4_only_status_rsize,
2496 },
2483}; 2497};
2484 2498
2485/** 2499/**
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 67b7e6f19ed6..b78280a8af73 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1880,7 +1880,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = {
1880 [OP_IO_ADVISE] = (nfsd4_dec)nfsd4_decode_notsupp, 1880 [OP_IO_ADVISE] = (nfsd4_dec)nfsd4_decode_notsupp,
1881 [OP_LAYOUTERROR] = (nfsd4_dec)nfsd4_decode_notsupp, 1881 [OP_LAYOUTERROR] = (nfsd4_dec)nfsd4_decode_notsupp,
1882 [OP_LAYOUTSTATS] = (nfsd4_dec)nfsd4_decode_notsupp, 1882 [OP_LAYOUTSTATS] = (nfsd4_dec)nfsd4_decode_notsupp,
1883 [OP_OFFLOAD_CANCEL] = (nfsd4_dec)nfsd4_decode_notsupp, 1883 [OP_OFFLOAD_CANCEL] = (nfsd4_dec)nfsd4_decode_offload_status,
1884 [OP_OFFLOAD_STATUS] = (nfsd4_dec)nfsd4_decode_offload_status, 1884 [OP_OFFLOAD_STATUS] = (nfsd4_dec)nfsd4_decode_offload_status,
1885 [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_notsupp, 1885 [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_notsupp,
1886 [OP_SEEK] = (nfsd4_dec)nfsd4_decode_seek, 1886 [OP_SEEK] = (nfsd4_dec)nfsd4_decode_seek,