History

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"

Linus Torvalds committed 7 years ago

Commit b910f6a2 parents b3e9783 766741f1 file · +0 −10Browse files

Unified · Split

fs/fuse/dev.c+0−10
@@ -1317,16 +1317,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, · 1316 unmodified lines
13171317 unsigned reqsize;
13181318 unsigned int hash;
13191319
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−
13301320 restart:
13311321 spin_lock(&fiq->waitq.lock);
13321322 err = -EAGAIN;