nfsd: Add DEALLOCATE support

DEALLOCATE only returns a status value, meaning we can use the noop()
xdr encoder to reply to the client.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

3 files changed, 17 insertions, 1 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index a261f1800922..74fb15eefc31 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -33,6 +33,7 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <linux/file.h>
+#include <linux/falloc.h>
 #include <linux/slab.h>
 
 #include "idmap.h"
@@ -1044,6 +1045,14 @@ nfsd4_allocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 }
 
 static __be32
+nfsd4_deallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                 struct nfsd4_fallocate *fallocate)
+{
+        return nfsd4_fallocate(rqstp, cstate, fallocate,
+                               FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE);
+}
+
+static __be32
 nfsd4_seek(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 struct nfsd4_seek *seek)
 {
@@ -1965,6 +1974,12 @@ static struct nfsd4_operation nfsd4_ops[] = {
                 .op_name = "OP_ALLOCATE",
                 .op_rsize_bop = (nfsd4op_rsize)nfsd4_write_rsize,
         },
+        [OP_DEALLOCATE] = {
+                .op_func = (nfsd4op_func)nfsd4_deallocate,
+                .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+                .op_name = "OP_DEALLOCATE",
+                .op_rsize_bop = (nfsd4op_rsize)nfsd4_write_rsize,
+        },
         [OP_SEEK] = {
                 .op_func = (nfsd4op_func)nfsd4_seek,
                 .op_name = "OP_SEEK",
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index a60cff86fc28..0622d4f4a9a2 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1624,7 +1624,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
         [OP_ALLOCATE]           = (nfsd4_dec)nfsd4_decode_fallocate,
         [OP_COPY]               = (nfsd4_dec)nfsd4_decode_notsupp,
         [OP_COPY_NOTIFY]        = (nfsd4_dec)nfsd4_decode_notsupp,
-        [OP_DEALLOCATE]         = (nfsd4_dec)nfsd4_decode_notsupp,
+        [OP_DEALLOCATE]         = (nfsd4_dec)nfsd4_decode_fallocate,
         [OP_IO_ADVISE]          = (nfsd4_dec)nfsd4_decode_notsupp,
         [OP_LAYOUTERROR]        = (nfsd4_dec)nfsd4_decode_notsupp,
         [OP_LAYOUTSTATS]        = (nfsd4_dec)nfsd4_decode_notsupp,
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index eeaa0d0c4f79..90a5925bd6ab 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -494,6 +494,7 @@ struct nfsd4_op {
 
                 /* NFSv4.2 */
                 struct nfsd4_fallocate          allocate;
+                struct nfsd4_fallocate          deallocate;
                 struct nfsd4_seek               seek;
         } u;
         struct nfs4_replay *                    replay;