mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
fuse fixes for 5.5-rc7
-----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:
commit
ab7541c3ad
@ -882,6 +882,7 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)
|
||||
struct fuse_args_pages *ap = &ia->ap;
|
||||
loff_t pos = page_offset(ap->pages[0]);
|
||||
size_t count = ap->num_pages << PAGE_SHIFT;
|
||||
ssize_t res;
|
||||
int err;
|
||||
|
||||
ap->args.out_pages = true;
|
||||
@ -896,7 +897,8 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)
|
||||
if (!err)
|
||||
return;
|
||||
} 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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user