diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-20 14:16:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-20 14:16:16 -0700 |
| commit | b910f6a7ccab60b4d930b438a97a265bb2b33135 (patch) | |
| tree | ee224200d5b35c3f6dd97cfbe5e02072a6b7c70d /fs | |
| parent | b3e978337b25b042aa653652a029e3d798814c12 (diff) | |
| parent | 766741fcaa1fe5da2cb1e33ae458a5630ff7f667 (diff) | |
Merge tag 'fuse-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse fix from Miklos Szeredi:
"Just a single revert, fixing a regression in -rc1"
* tag 'fuse-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
Revert "fuse: require /dev/fuse reads to have enough buffer capacity"
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/dev.c | 10 |
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; |