Changeset 31719 in vbox

Timestamp:

Aug 17, 2010 11:22:15 AM (14 years ago)

Author:

vboxsync

Message:

Linux additions: Linux 2.6.36 compile fixes

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• utils.c (modified) (1 diff)
• vfsmod.c (modified) (3 diffs)

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

@@ -386 +386 @@
     uint16_t p_len;
     uint8_t *p_name;
-    uint8_t *dst;
     int fRoot = 0;
 

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

@@ -340 +340 @@
 /* this is called when vfs is about to destroy the [inode]. all
    resources associated with this [inode] must be cleared here */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
 static void sf_clear_inode(struct inode *inode)
 {
@@ -354 +355 @@
     SET_INODE_INFO(inode, NULL);
 }
+#else
+static void sf_evict_inode(struct inode *inode)
+{
+    struct sf_inode_info *sf_i;
+
+    TRACE();
+    truncate_inode_pages(&inode->i_data, 0);
+    end_writeback(inode);
+
+    sf_i = GET_INODE_INFO(inode);
+    if (!sf_i)
+        return;
+
+    BUG_ON(!sf_i->path);
+    kfree(sf_i->path);
+    kfree(sf_i);
+    SET_INODE_INFO(inode, NULL);
+}
+#endif
 
 /* this is called by vfs when it wants to populate [inode] with data.
@@ -398 +418 @@
 static struct super_operations sf_super_ops =
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
     .clear_inode = sf_clear_inode,
+#else
+    .evict_inode = sf_evict_inode,
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
     .read_inode  = sf_read_inode,