From: Miklos Szeredi <mszeredi@redhat.com>
Date: Tue, 11 Jun 2019 11:35:22 +0000 (+0200)
Subject: Revert "fuse: require /dev/fuse reads to have enough buffer capacity"
X-Git-Tag: v5.2-rc6~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=766741fcaa1fe5da2cb1e33ae458a5630ff7f667;p=thirdparty%2Flinux.git

Revert "fuse: require /dev/fuse reads to have enough buffer capacity"

This reverts commit d4b13963f217dd947da5c0cabd1569e914d21699.

The commit introduced a regression in glusterfs-fuse.

Reported-by: Sander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 24ea19cfe07e2..ea8237513dfaf 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1317,16 +1317,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
 	unsigned reqsize;
 	unsigned int hash;
 
-	/*
-	 * Require sane minimum read buffer - that has capacity for fixed part
-	 * of any request header + negotated max_write room for data. If the
-	 * requirement is not satisfied return EINVAL to the filesystem server
-	 * to indicate that it is not following FUSE server/client contract.
-	 * Don't dequeue / abort any request.
-	 */
-	if (nbytes < max_t(size_t, FUSE_MIN_READ_BUFFER, 4096 + fc->max_write))
-		return -EINVAL;
-
  restart:
 	spin_lock(&fiq->waitq.lock);
 	err = -EAGAIN;