Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 766741fc authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

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



This reverts commit d4b13963.

The commit introduced a regression in glusterfs-fuse.

Reported-by: default avatarSander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent d1fdb6d8
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -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;