NFSD: Fix bad checking of space for padding in splice read

Note that the caller has already reserved space for count and eof, so
xdr->p has already moved past them, only the padding remains.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Fixes dc97618ddd (nfsd4: separate splice and readv cases)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 1ad7bd4e346fc9d920663d7de572f7f5f8fb059b..01023a5951632326a42fdc352352bc12754527e6 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3072,11 +3072,8 @@ static __be32 nfsd4_encode_splice_read(
        __be32 nfserr;
        __be32 *p = xdr->p - 2;
 
-       /*
-        * Don't inline pages unless we know there's room for eof,
-        * count, and possible padding:
-        */
-       if (xdr->end - xdr->p < 3)
+       /* Make sure there will be room for padding if needed */
+       if (xdr->end - xdr->p < 1)
                return nfserr_resource;
 
        nfserr = nfsd_splice_read(read->rd_rqstp, file,