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"
Unified · Split
| @@ -1317,16 +1317,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, · 1316 unmodified lines | |||
| 1317 | unsigned reqsize; | 1317 | unsigned reqsize; |
| 1318 | unsigned int hash; | 1318 | unsigned int hash; |
| 1319 | 1319 | ||
| 1320 | /* | ||
| 1321 | * Require sane minimum read buffer - that has capacity for fixed part | ||
| 1322 | * of any request header + negotated max_write room for data. If the | ||
| 1323 | * requirement is not satisfied return EINVAL to the filesystem server | ||
| 1324 | * to indicate that it is not following FUSE server/client contract. | ||
| 1325 | * Don't dequeue / abort any request. | ||
| 1326 | */ | ||
| 1327 | if (nbytes < max_t(size_t, FUSE_MIN_READ_BUFFER, 4096 + fc->max_write)) | ||
| 1328 | return -EINVAL; | ||
| 1329 | |||
| 1330 | restart: | 1320 | restart: |
| 1331 | spin_lock(&fiq->waitq.lock); | 1321 | spin_lock(&fiq->waitq.lock); |
| 1332 | err = -EAGAIN; | 1322 | err = -EAGAIN; |