Commit 8586feb

committed

Additions: Linux: vboxsf: More fixes for kernel 6.16, bugref:10908.

svn:sync-xref-src-repo-rev: r169199

1 parent 88eca72 commit 8586febCopy full SHA for 8586feb

File tree

1 file changed

+11

-5

lines changed

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

1 file changed

+11

-5

lines changed

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

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: regops.c 109747 2025-06-02 17:38:05Z vadim.galitsyn@oracle.com $ */`
	`1`	`+/* $Id: regops.c 109844 2025-06-12 12:00:50Z vadim.galitsyn@oracle.com $ */`
`2`	`2`	`/** @file`
`3`	`3`	`* vboxsf - VBox Linux Shared Folders VFS, regular file inode and file operations.`
`4`	`4`	`*/`
`@@ -84,6 +84,12 @@`
`84`	`84`	`# define PageUptodate(a_pPage) Page_Uptodate(a_pPage)`
`85`	`85`	`#endif`
`86`	`86`
	`87`	`+#if RTLNX_VER_MIN(6,16,0)`
	`88`	`+# define VBOX_PAGE_INDEX(_page) (_page->__folio_index)`
	`89`	`+#else`
	`90`	`+# define VBOX_PAGE_INDEX(_page) (_page->index)`
	`91`	`+#endif`
	`92`	`+`
`87`	`93`
`88`	`94`	`/*********************************************************************************************************************************`
`89`	`95`	`* Defined Constants And Macros *`
`@@ -1789,7 +1795,7 @@ static void vbsf_reg_write_sync_page_cache(struct address_space *mapping, loff_t`
`1789`	`1795`	`struct page *pDstPage = find_lock_page(mapping, idxPage);`
`1790`	`1796`	`if (pDstPage) {`
`1791`	`1797`	`if ( pDstPage->mapping == mapping /* ignore if re-purposed (paranoia) */`
`1792`		`- && pDstPage->index == idxPage`
	`1798`	`+ && VBOX_PAGE_INDEX(pDstPage) == idxPage`
`1793`	`1799`	`&& !PageDirty(pDstPage) /* ignore if dirty */`
`1794`	`1800`	`&& !PageWriteback(pDstPage) /* ignore if being written back */ ) {`
`1795`	`1801`	`/*`
`@@ -1820,7 +1826,7 @@ static void vbsf_reg_write_sync_page_cache(struct address_space *mapping, loff_t`
`1820`	`1826`	`# endif`
`1821`	`1827`	`} else`
`1822`	`1828`	`SFLOGFLOW(("vbsf_reg_write_sync_page_cache: Skipping page %p: mapping=%p (vs %p) writeback=%d offset=%#lx (vs%#lx)\n",`
`1823`		`- pDstPage, pDstPage->mapping, mapping, PageWriteback(pDstPage), pDstPage->index, idxPage));`
	`1829`	`+ pDstPage, pDstPage->mapping, mapping, PageWriteback(pDstPage), VBOX_PAGE_INDEX(pDstPage), idxPage));`
`1824`	`1830`	`unlock_page(pDstPage);`
`1825`	`1831`	`vbsf_put_page(pDstPage);`
`1826`	`1832`	`}`
`@@ -3632,7 +3638,7 @@ static int vbsf_readpage(struct file file, struct page page)`
`3632`	`3638`	`struct inode *inode = VBSF_GET_F_DENTRY(file)->d_inode;`
`3633`	`3639`	`int err;`
`3634`	`3640`
`3635`		`- SFLOGFLOW(("vbsf_readpage: inode=%p file=%p page=%p off=%#llx\n", inode, file, page, (uint64_t)page->index << PAGE_SHIFT));`
	`3641`	`+ SFLOGFLOW(("vbsf_readpage: inode=%p file=%p page=%p off=%#llx\n", inode, file, page, (uint64_t)VBOX_PAGE_INDEX(page) << PAGE_SHIFT));`
`3636`	`3642`	`Assert(PageLocked(page));`
`3637`	`3643`
`3638`	`3644`	`if (PageUptodate(page)) {`
`@@ -3653,7 +3659,7 @@ static int vbsf_readpage(struct file file, struct page page)`
`3653`	`3659`	`vrc = VbglR0SfHostReqReadPgLst(pSuperInfo->map.root,`
`3654`	`3660`	`pReq,`
`3655`	`3661`	`sf_r->Handle.hHost,`
`3656`		`- (uint64_t)page->index << PAGE_SHIFT,`
	`3662`	`+ (uint64_t)VBOX_PAGE_INDEX(page) << PAGE_SHIFT,`
`3657`	`3663`	`PAGE_SIZE,`
`3658`	`3664`	`1 /cPages/);`
`3659`	`3665`

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 8586feb

File tree

1 file changed

1 file changed

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

0 commit comments