diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:24:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:24:50 +0200 |
| commit | ebbe30f4bba127505c5664dd67f519e5e06d16be (patch) | |
| tree | 7285f44ba6e74a25876982cb50f9a430169cc42e /fs/fuse/dev.c | |
| parent | 6pack: propagage new tty types (diff) | |
| parent | Linux 6.11-rc4 (diff) | |
| download | linux-ebbe30f4bba127505c5664dd67f519e5e06d16be.tar.xz linux-ebbe30f4bba127505c5664dd67f519e5e06d16be.zip | |
Merge 6.11-rc4 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/fuse/dev.c')
| -rw-r--r-- | fs/fuse/dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 9eb191b5c4de..7146038b2fe7 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1618,9 +1618,11 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size, this_num = min_t(unsigned, num, PAGE_SIZE - offset); err = fuse_copy_page(cs, &page, offset, this_num, 0); - if (!err && offset == 0 && - (this_num == PAGE_SIZE || file_size == end)) + if (!PageUptodate(page) && !err && offset == 0 && + (this_num == PAGE_SIZE || file_size == end)) { + zero_user_segment(page, this_num, PAGE_SIZE); SetPageUptodate(page); + } unlock_page(page); put_page(page); |