diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-08 09:41:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-08 09:41:18 -0800 |
| commit | 92f90cc9fe0e7a984ea3d4bf3d120e30ba8a2118 (patch) | |
| tree | d74ad5ebdcf53770d88b6fdcc56f644d5ab9d89d /fs/fuse/ioctl.c | |
| parent | cd22a8bfcfe07ef35b1b5d96dd468e92dc5e9d8a (diff) | |
| parent | 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 (diff) | |
Merge tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse fixes from Miklos Szeredi:
- Fix an issue with splice on the fuse device
- Fix a regression in the fileattr API conversion
- Add a small userspace API improvement
* tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix pipe buffer lifetime for direct_io
fuse: move FUSE_SUPER_MAGIC definition to magic.h
fuse: fix fileattr op failure
Diffstat (limited to 'fs/fuse/ioctl.c')
| -rw-r--r-- | fs/fuse/ioctl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/fuse/ioctl.c b/fs/fuse/ioctl.c index fbc09dab1f85..df58966bc874 100644 --- a/fs/fuse/ioctl.c +++ b/fs/fuse/ioctl.c @@ -394,9 +394,12 @@ static int fuse_priv_ioctl(struct inode *inode, struct fuse_file *ff, args.out_args[1].value = ptr; err = fuse_simple_request(fm, &args); - if (!err && outarg.flags & FUSE_IOCTL_RETRY) - err = -EIO; - + if (!err) { + if (outarg.result < 0) + err = outarg.result; + else if (outarg.flags & FUSE_IOCTL_RETRY) + err = -EIO; + } return err; } |