Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 52fccce

Browse files
Additions: Linux: vboxsf: Introduce initial support for kernel 6.17, bugref:10950.
svn:sync-xref-src-repo-rev: r170176
1 parent 735cb8f commit 52fccce

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: regops.c 109844 2025-06-12 12:00:50Z vadim.galitsyn@oracle.com $ */
1+
/* $Id: regops.c 110673 2025-08-11 12:56:27Z vadim.galitsyn@oracle.com $ */
22
/** @file
33
* vboxsf - VBox Linux Shared Folders VFS, regular file inode and file operations.
44
*/
@@ -3806,7 +3806,14 @@ static inline void vbsf_write_begin_warn(loff_t pos, unsigned len, unsigned flag
38063806
}
38073807
}
38083808

3809-
# if RTLNX_VER_MIN(6,12,0)
3809+
# if RTLNX_VER_MIN(6,17,0)
3810+
static int vbsf_write_begin(const struct kiocb *iocb, struct address_space *mapping, loff_t pos,
3811+
unsigned len, struct folio **foliop, void **fsdata)
3812+
{
3813+
vbsf_write_begin_warn(pos, len, 0);
3814+
return simple_write_begin(iocb, mapping, pos, len, foliop, fsdata);
3815+
}
3816+
# elif RTLNX_VER_MIN(6,12,0)
38103817
static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
38113818
unsigned len, struct folio **foliop, void **fsdata)
38123819
{
@@ -3835,7 +3842,12 @@ static int vbsf_write_begin(struct file *file, struct address_space *mapping, lo
38353842
/**
38363843
* Companion to vbsf_write_begin (i.e. shouldn't be called).
38373844
*/
3838-
# if RTLNX_VER_MIN(6,12,0)
3845+
3846+
# if RTLNX_VER_MIN(6,17,0)
3847+
static int vbsf_write_end(const struct kiocb *iocb, struct address_space *mapping,
3848+
loff_t pos, unsigned int len, unsigned int copied,
3849+
struct folio *folio, void *fsdata)
3850+
# elif RTLNX_VER_MIN(6,12,0)
38393851
static int vbsf_write_end(struct file *file, struct address_space *mapping,
38403852
loff_t pos, unsigned int len, unsigned int copied,
38413853
struct folio *folio, void *fsdata)

‎src/VBox/Additions/linux/sharedfolders/vfsmod.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: vfsmod.c 106061 2024年09月16日 14:03:52Z knut.osmundsen@oracle.com $ */
1+
/* $Id: vfsmod.c 110673 2025年08月11日 12:56:27Z vadim.galitsyn@oracle.com $ */
22
/** @file
33
* vboxsf - VBox Linux Shared Folders VFS, module init/term, super block management.
44
*/
@@ -913,7 +913,9 @@ static int vbsf_read_super_aux(struct super_block *sb, void *data, int flags)
913913
sb->s_time_gran = 1; /* This might be a little optimistic for windows hosts, where it should be 100. */
914914
#endif
915915
sb->s_op = &g_vbsf_super_ops;
916-
#if RTLNX_VER_MIN(2,6,38)
916+
#if RTLNX_VER_MIN(6,17,0)
917+
set_default_d_op(sb, &vbsf_dentry_ops);
918+
#elif RTLNX_VER_MIN(2,6,38)
917919
sb->s_d_op = &vbsf_dentry_ops;
918920
#endif
919921

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /