diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-26 19:38:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-26 19:38:46 -0700 |
| commit | 39c3c396f8131f3db454c80e0fcfcdc54ed9ec01 (patch) | |
| tree | 5e73a645381f47535903fbc6a16442a4a6ef2b85 /fs/read_write.c | |
| parent | 5de64d44968e4ae66ebdb0a2d08b443f189d3651 (diff) | |
| parent | 1f7ea54727caaa6701a15af0cbeddfdb015b2869 (diff) | |
| download | linux-39c3c396f8131f3db454c80e0fcfcdc54ed9ec01.tar.gz linux-39c3c396f8131f3db454c80e0fcfcdc54ed9ec01.tar.bz2 linux-39c3c396f8131f3db454c80e0fcfcdc54ed9ec01.zip | |
Merge tag 'mm-hotfixes-stable-2022-07-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton:
"Thirteen hotfixes.
Eight are cc:stable and the remainder are for post-5.18 issues or are
too minor to warrant backporting"
* tag 'mm-hotfixes-stable-2022-07-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
mailmap: update Gao Xiang's email addresses
userfaultfd: provide properly masked address for huge-pages
Revert "ocfs2: mount shared volume without ha stack"
hugetlb: fix memoryleak in hugetlb_mcopy_atomic_pte
fs: sendfile handles O_NONBLOCK of out_fd
ntfs: fix use-after-free in ntfs_ucsncmp()
secretmem: fix unhandled fault in truncate
mm/hugetlb: separate path for hwpoison entry in copy_hugetlb_page_range()
mm: fix missing wake-up event for FSDAX pages
mm: fix page leak with multiple threads mapping the same page
mailmap: update Seth Forshee's email address
tmpfs: fix the issue that the mount and remount results are inconsistent.
mm: kfence: apply kmemleak_ignore_phys on early allocated pool
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index e0777eefd846..397da0236607 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1263,6 +1263,9 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, count, fl); file_end_write(out.file); } else { + if (out.file->f_flags & O_NONBLOCK) + fl |= SPLICE_F_NONBLOCK; + retval = splice_file_to_pipe(in.file, opipe, &pos, count, fl); } |