Changeset 107165 in vbox

Timestamp:

Nov 27, 2024 11:59:47 AM (7 weeks ago)

Author:

vboxsync

Message:

Additions: Linux: vboxsf: Introduce initial support for RHEL 9.6 kernel, bugref:10381.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (4 diffs)
• utils.c (modified) (4 diffs)
• vfsmod.h (modified) (2 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -1047 +1047 @@
  * @returns 0 on success, Linux error code otherwise
  */
-#if RTLNX_VER_MIN(6,3,0) || defined(DOXYGEN_RUNNING)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99) || defined(DOXYGEN_RUNNING)
 static int vbsf_inode_create(struct mnt_idmap *idmap, struct inode *parent, struct dentry *dentry, umode_t mode, bool excl)
 #elif RTLNX_VER_MIN(5,12,0)
@@ -1089 +1089 @@
  * @returns 0 on success, Linux error code otherwise
  */
-#if RTLNX_VER_MIN(6,3,0) || defined(DOXYGEN_RUNNING)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99) || defined(DOXYGEN_RUNNING)
 static int vbsf_inode_mkdir(struct mnt_idmap *idmap, struct inode *parent, struct dentry *dentry, umode_t mode)
 #elif RTLNX_VER_MIN(5,12,0)
@@ -1206 +1206 @@
  * @returns 0 on success, Linux error code otherwise
  */
-#if RTLNX_VER_MIN(6,3,0) || defined(DOXYGEN_RUNNING)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99) || defined(DOXYGEN_RUNNING)
 static int vbsf_inode_rename(struct mnt_idmap *idmap,
                              struct inode *old_parent, struct dentry *old_dentry,
@@ -1322 +1322 @@
  * Create a symbolic link.
  */
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
 static int vbsf_inode_symlink(struct mnt_idmap *idmap, struct inode *parent, struct dentry *dentry, const char *target)
 #elif RTLNX_VER_MIN(5,12,0)

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -725 +725 @@
    [generic_fillattr] */
 #if RTLNX_VER_MIN(2,5,18)
-# if RTLNX_VER_MIN(6,3,0)
+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
 int vbsf_inode_getattr(struct mnt_idmap *idmap, const struct path *path,
                        struct kstat *kstat, u32 request_mask, unsigned int flags)
@@ -773 +773 @@
 # if RTLNX_VER_MIN(6,6,0)
         generic_fillattr(idmap, request_mask, dentry->d_inode, kstat);
-# elif RTLNX_VER_MIN(6,3,0)
+# elif RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
         generic_fillattr(idmap, dentry->d_inode, kstat);
 # elif RTLNX_VER_MIN(5,12,0)
@@ -825 +825 @@
  * Modify inode attributes.
  */
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
 int vbsf_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry, struct iattr *iattr)
 #elif RTLNX_VER_MIN(5,12,0)
@@ -851 +851 @@
     iattr->ia_valid |= ATTR_FORCE;
 #if (RTLNX_VER_RANGE(3,16,39,  3,17,0)) || RTLNX_VER_MIN(4,9,0) || (RTLNX_VER_RANGE(4,1,37,  4,2,0)) || RTLNX_UBUNTU_ABI_MIN(4,4,255,208)
-# if RTLNX_VER_MIN(6,3,0)
+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
     rc = setattr_prepare(idmap, dentry, iattr);
 # elif RTLNX_VER_MIN(5,12,0)

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

@@ -266 +266 @@
 extern int  vbsf_inode_revalidate_with_handle(struct dentry *dentry, SHFLHANDLE hHostFile, bool fForced, bool fInodeLocked);
 #if RTLNX_VER_MIN(2,5,18)
-# if RTLNX_VER_MIN(6,3,0)
+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
 extern int  vbsf_inode_getattr(struct mnt_idmap *idmap, const struct path *path,
                                struct kstat *kstat, u32 request_mask, unsigned int query_flags);
@@ -280 +280 @@
 extern int  vbsf_inode_revalidate(struct dentry *dentry);
 #endif /* < 2.5.44 */
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_RANGE(9,6, 9,99)
 extern int  vbsf_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry, struct iattr *iattr);
 #elif RTLNX_VER_MIN(5,12,0)