Skip to content

Commit

Permalink
Merge tag 'fuse-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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"
  • Loading branch information
torvalds committed Jun 20, 2019
2 parents b3e9783 + 766741f commit b910f6a
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b910f6a

Please sign in to comment.