Commit 52fe696

committed

Additions: Linux: vboxsf: Add initial support for kernel 6.16, bugref:10908.

Deprecated interface ->writepage() is commented out, ->writepages() needs to be implemented on the next iteration. This commit fixes build issue and keeps vboxsf functional on kernel 6.16. svn:sync-xref-src-repo-rev: r169091

1 parent c4934d3 commit 52fe696Copy full SHA for 52fe696

File tree

1 file changed

+12

-8

lines changed

src/VBox/Additions/linux/sharedfolders
- regops.c

1 file changed

+12

-8

lines changed

`‎src/VBox/Additions/linux/sharedfolders/regops.c‎`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: regops.c 108498 2025-02-21 11:57:46Z vadim.galitsyn@oracle.com $ */`
	`1`	`+/* $Id: regops.c 109747 2025-06-02 17:38:05Z vadim.galitsyn@oracle.com $ */`
`2`	`2`	`/** @file`
`3`	`3`	`* vboxsf - VBox Linux Shared Folders VFS, regular file inode and file operations.`
`4`	`4`	`*/`
`@@ -3695,11 +3695,12 @@ static int vbsf_readpage(struct file file, struct page page)`
`3695`	`3695`	`* Needed for mmap and writes when the file is mmapped in a shared+writeable`
`3696`	`3696`	`* fashion.`
`3697`	`3697`	`*/`
`3698`		`-#if RTLNX_VER_MIN(2,5,52)`
	`3698`	`+#if RTLNX_VER_MAX(6,16,0)`
	`3699`	`+# if RTLNX_VER_MIN(2,5,52)`
`3699`	`3700`	`static int vbsf_writepage(struct page page, struct writeback_control wbc)`
`3700`		`-#else`
	`3701`	`+#else`
`3701`	`3702`	`static int vbsf_writepage(struct page *page)`
`3702`		`-#endif`
	`3703`	`+#endif`
`3703`	`3704`	`{`
`3704`	`3705`	`struct address_space *mapping = page->mapping;`
`3705`	`3706`	`struct inode *inode = mapping->host;`
`@@ -3742,11 +3743,11 @@ static int vbsf_writepage(struct page *page)`
`3742`	`3743`	`&& offEndOfWrite > i_size_read(inode))`
`3743`	`3744`	`i_size_write(inode, offEndOfWrite);`
`3744`	`3745`
`3745`		`-#if RTLNX_VER_MAX(6,12,0)`
	`3746`	`+#if RTLNX_VER_MAX(6,12,0)`
`3746`	`3747`	`/* Update and unlock the page. */`
`3747`	`3748`	`if (PageError(page))`
`3748`	`3749`	`ClearPageError(page);`
`3749`		`-#endif`
	`3750`	`+#endif`
`3750`	`3751`	`SetPageUptodate(page);`
`3751`	`3752`	`unlock_page(page);`
`3752`	`3753`
`@@ -3768,12 +3769,13 @@ static int vbsf_writepage(struct page *page)`
`3768`	`3769`	`printk("vbsf_writepage: no writable handle for %s..\n", sf_i->path->String.ach);`
`3769`	`3770`	`err = -EIO;`
`3770`	`3771`	`}`
`3771`		`-#if RTLNX_VER_MAX(6,12,0)`
	`3772`	`+#if RTLNX_VER_MAX(6,12,0)`
`3772`	`3773`	`SetPageError(page);`
`3773`		`-#endif`
	`3774`	`+#endif`
`3774`	`3775`	`unlock_page(page);`
`3775`	`3776`	`return err;`
`3776`	`3777`	`}`
	`3778`	`+#endif /* < 6.16.0 */`
`3777`	`3779`
`3778`	`3780`
`3779`	`3781`	`#if RTLNX_VER_MIN(2,6,24)`
`@@ -3905,7 +3907,9 @@ struct address_space_operations vbsf_reg_aops = {`
`3905`	`3907`	`#else`
`3906`	`3908`	`.readpage = vbsf_readpage,`
`3907`	`3909`	`#endif`
	`3910`	`+#if RTLNX_VER_MAX(6,16,0)`
`3908`	`3911`	`.writepage = vbsf_writepage,`
	`3912`	`+#endif`
`3909`	`3913`	`/** @todo Need .writepages if we want msync performance... */`
`3910`	`3914`	`#if RTLNX_VER_MIN(5,18,0) \|\| RTLNX_RHEL_RANGE(9,2, 9,99)`
`3911`	`3915`	`.dirty_folio = filemap_dirty_folio,`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 52fe696

File tree

1 file changed

1 file changed

`‎src/VBox/Additions/linux/sharedfolders/regops.c‎`

0 commit comments