Merge tag 'nfsd-5.1' of git://linux-nfs.org/~bfields/linux

[thirdparty/kernel/stable.git] / fs / nfsd / nfs4callback.c

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 9b38dab1c21ba3547592fb6d955aabe853ca3353..d219159b98afc54bda6d2efee824b41487db17c0 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -60,16 +60,6 @@ struct nfs4_cb_compound_hdr {
        int             status;
 };
 
-/*
- * Handle decode buffer overflows out-of-line.
- */
-static void print_overflow_msg(const char *func, const struct xdr_stream *xdr)
-{
-       dprintk("NFS: %s prematurely hit the end of our receive buffer. "
-               "Remaining buffer length is %tu words.\n",
-               func, xdr->end - xdr->p);
-}
-
 static __be32 *xdr_encode_empty_array(__be32 *p)
 {
        *p++ = xdr_zero;
@@ -240,7 +230,6 @@ static int decode_cb_op_status(struct xdr_stream *xdr,
        *status = nfs_cb_stat_to_errno(be32_to_cpup(p));
        return 0;
 out_overflow:
-       print_overflow_msg(__func__, xdr);
        return -EIO;
 out_unexpected:
        dprintk("NFSD: Callback server returned operation %d but "
@@ -309,7 +298,6 @@ static int decode_cb_compound4res(struct xdr_stream *xdr,
        hdr->nops = be32_to_cpup(p);
        return 0;
 out_overflow:
-       print_overflow_msg(__func__, xdr);
        return -EIO;
 }
 
@@ -437,7 +425,6 @@ out:
        cb->cb_seq_status = status;
        return status;
 out_overflow:
-       print_overflow_msg(__func__, xdr);
        status = -EIO;
        goto out;
 }