summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2019-06-11 13:35:22 +0200
committerMiklos Szeredi <mszeredi@redhat.com>2019-06-11 13:35:22 +0200
commit766741fcaa1fe5da2cb1e33ae458a5630ff7f667 (patch)
treef1e611778f20cfebca2fc2b4a37496332bc8160e /fs
parentd1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff)
downloadlinux-766741fcaa1fe5da2cb1e33ae458a5630ff7f667.tar.gz
linux-766741fcaa1fe5da2cb1e33ae458a5630ff7f667.tar.bz2
linux-766741fcaa1fe5da2cb1e33ae458a5630ff7f667.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dev.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 24ea19cfe07e..ea8237513dfa 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;