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

Timestamp:

Sep 11, 2023 2:06:52 PM (17 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxsf: Introduce initial support for kernel 6.6, bugref:10524.

File:

• trunk/src/VBox/Additions/linux/sharedfolders/utils.c (modified) (4 diffs)

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

@@ -290 +290 @@
 }
 
+/**
+ * Update inode timestamps.
+ *
+ * @param pInode    Linux inode object.
+ # @param pObjInfo  VBox vboxsf object.
+ */
+static void vbsf_update_inode_timestamps(struct inode *pInode, PSHFLFSOBJINFO pObjInfo)
+{
+#if RTLNX_VER_MIN(6,6,0)
+    struct timespec64 ts;
+    vbsf_time_to_linux(&ts, &pObjInfo->ChangeTime);
+    inode_set_ctime_to_ts(pInode, ts);
+#else
+    vbsf_time_to_linux(&pInode->i_atime, &pObjInfo->AccessTime);
+    vbsf_time_to_linux(&pInode->i_ctime, &pObjInfo->ChangeTime);
+    vbsf_time_to_linux(&pInode->i_mtime, &pObjInfo->ModificationTime);
+#endif
+}
 
 /**
@@ -349 +367 @@
     inode->i_blocks = (pObjInfo->cbAllocated + 511) / 512;
 
-    vbsf_time_to_linux(&inode->i_atime, &pObjInfo->AccessTime);
-    vbsf_time_to_linux(&inode->i_ctime, &pObjInfo->ChangeTime);
-    vbsf_time_to_linux(&inode->i_mtime, &pObjInfo->ModificationTime);
+    vbsf_update_inode_timestamps(inode, pObjInfo);
+
     sf_i->BirthTime = pObjInfo->BirthTime;
     sf_i->ModificationTime = pObjInfo->ModificationTime;
@@ -417 +434 @@
      * Update the timestamps.
      */
-    vbsf_time_to_linux(&pInode->i_atime, &pObjInfo->AccessTime);
-    vbsf_time_to_linux(&pInode->i_ctime, &pObjInfo->ChangeTime);
-    vbsf_time_to_linux(&pInode->i_mtime, &pObjInfo->ModificationTime);
+    vbsf_update_inode_timestamps(pInode, pObjInfo);
     pInodeInfo->BirthTime = pObjInfo->BirthTime;
 
@@ -744 +759 @@
     if (rc == 0) {
         /* Do generic filling in of info. */
-# if RTLNX_VER_MIN(6,3,0)
+# if RTLNX_VER_MIN(6,6,0)
+        generic_fillattr(idmap, request_mask, dentry->d_inode, kstat);
+# elif RTLNX_VER_MIN(6,3,0)
         generic_fillattr(idmap, dentry->d_inode, kstat);
 # elif RTLNX_VER_MIN(5,12,0)