GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 07:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fuse fixes for 5.5-rc7

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSQHSd0lITzzeNWNm3h3BK/laaZPAUCXiF1QwAKCRDh3BK/laaZ
 POf9AQCoPHnT7oH1gYUHfZAhS4cYX72+v6F75gYKUce0/jSDPQEAhbcMhoo31aO2
 BGTXRkeCVtg77IhxUmhXCLoQYjpSoQc=
 =UOsx
 -----END PGP SIGNATURE-----

Merge tag 'fuse-fixes-5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse fix from Miklos Szeredi:
 "Fix a regression in the last release affecting the ftp module of the
  gvfs filesystem"

* tag 'fuse-fixes-5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix fuse_send_readpages() in the syncronous read case
This commit is contained in:
Linus Torvalds 2020-01-17 08:42:02 -08:00
commit ab7541c3ad
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/fuse/file.c
View file

@ -882,6 +882,7 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)
struct fuse_args_pages *ap = &ia->ap; struct fuse_args_pages *ap = &ia->ap;
loff_t pos = page_offset(ap->pages[0]); loff_t pos = page_offset(ap->pages[0]);
size_t count = ap->num_pages << PAGE_SHIFT; size_t count = ap->num_pages << PAGE_SHIFT;
ssize_t res;
int err; int err;
ap->args.out_pages = true; ap->args.out_pages = true;
@ -896,7 +897,8 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)
if (!err) if (!err)
return; return;
} else { } else {
err = fuse_simple_request(fc, &ap->args); res = fuse_simple_request(fc, &ap->args);
err = res < 0 ? res : 0;
} }
fuse_readpages_end(fc, &ap->args, err); fuse_readpages_end(fc, &ap->args, err);
} }