Changeset 88273 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 24, 2021 12:18:49 PM (4 years ago)

Author:

vboxsync

Message:

GAs: Linux: make vboxsf working w/ 5.12-rc4 kernel, bugref:9976.

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

@@ -1045 +1045 @@
  * @returns 0 on success, Linux error code otherwise
  */
-#if RTLNX_VER_MIN(3,6,0) || defined(DOXYGEN_RUNNING)
+#if RTLNX_VER_MIN(5,12,0)
+static int vbsf_inode_create(struct user_namespace *ns, struct inode *parent, struct dentry *dentry, umode_t mode, bool excl)
+#elif RTLNX_VER_MIN(3,6,0) || defined(DOXYGEN_RUNNING)
 static int vbsf_inode_create(struct inode *parent, struct dentry *dentry, umode_t mode, bool excl)
 #elif RTLNX_VER_MIN(3,3,0)
@@ -1082 +1084 @@
  * @returns 0 on success, Linux error code otherwise
  */
-#if RTLNX_VER_MIN(3,3,0)
+#if RTLNX_VER_MIN(5,12,0)
+static int vbsf_inode_mkdir(struct user_namespace *ns, struct inode *parent, struct dentry *dentry, umode_t mode)
+#elif RTLNX_VER_MIN(3,3,0)
 static int vbsf_inode_mkdir(struct inode *parent, struct dentry *dentry, umode_t mode)
 #else
@@ -1194 +1198 @@
  * @returns 0 on success, Linux error code otherwise
  */
+#if RTLNX_VER_MIN(5,12,0)
+static int vbsf_inode_rename(struct user_namespace *ns,
+                             struct inode *old_parent, struct dentry *old_dentry,
+                             struct inode *new_parent, struct dentry *new_dentry, unsigned flags)
+#else
 static int vbsf_inode_rename(struct inode *old_parent, struct dentry *old_dentry,
                              struct inode *new_parent, struct dentry *new_dentry, unsigned flags)
+#endif
 {
     /*
@@ -1300 +1310 @@
  * Create a symbolic link.
  */
+#if RTLNX_VER_MIN(5,12,0)
+static int vbsf_inode_symlink(struct user_namespace *ns, struct inode *parent, struct dentry *dentry, const char *target)
+#else
 static int vbsf_inode_symlink(struct inode *parent, struct dentry *dentry, const char *target)
+#endif
 {
     /*

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

@@ -701 +701 @@
 #if RTLNX_VER_MIN(2,5,18)
 
-# if RTLNX_VER_MIN(4,11,0)
+#if RTLNX_VER_MIN(5,12,0)
+int vbsf_inode_getattr(struct user_namespace *ns, const struct path *path,
+    struct kstat *kstat, u32 request_mask, unsigned int flags)
+# elif RTLNX_VER_MIN(4,11,0)
 int vbsf_inode_getattr(const struct path *path, struct kstat *kstat, u32 request_mask, unsigned int flags)
 # else
@@ -741 +744 @@
     if (rc == 0) {
         /* Do generic filling in of info. */
+# if RTLNX_VER_MIN(5,12,0)
+        generic_fillattr(ns, dentry->d_inode, kstat);
+# else
         generic_fillattr(dentry->d_inode, kstat);
+# endif
 
         /* Add birth time. */
@@ -787 +794 @@
  * Modify inode attributes.
  */
+#if RTLNX_VER_MIN(5,12,0)
+int vbsf_inode_setattr(struct user_namespace *ns, struct dentry *dentry, struct iattr *iattr)
+#else
 int vbsf_inode_setattr(struct dentry *dentry, struct iattr *iattr)
+#endif
 {
     struct inode           *pInode     = dentry->d_inode;
@@ -807 +818 @@
     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))
+# if RTLNX_VER_MIN(5,12,0)
+    rc = setattr_prepare(ns, dentry, iattr);
+# else
     rc = setattr_prepare(dentry, iattr);
+# endif
 #else
     rc = inode_change_ok(pInode, iattr);

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

@@ -265 +265 @@
 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(4,11,0)
+# if RTLNX_VER_MIN(5,12,0)
+extern int  vbsf_inode_getattr(struct user_namespace *ns, const struct path *path,
+    struct kstat *kstat, u32 request_mask, unsigned int query_flags);
+# elif RTLNX_VER_MIN(4,11,0)
 extern int  vbsf_inode_getattr(const struct path *path, struct kstat *kstat, u32 request_mask, unsigned int query_flags);
 # else
@@ -273 +276 @@
 extern int  vbsf_inode_revalidate(struct dentry *dentry);
 #endif /* < 2.5.44 */
+#if RTLNX_VER_MIN(5,12,0)
+extern int  vbsf_inode_setattr(struct user_namespace *ns, struct dentry *dentry, struct iattr *iattr);
+#else
 extern int  vbsf_inode_setattr(struct dentry *dentry, struct iattr *iattr);
+#endif