Changeset 5984 in vbox

Timestamp:

Dec 6, 2007 1:06:54 PM (17 years ago)

Author:

vboxsync

Message:

Linux Additions: implemented a simple sendfile using Linux kernel defaults. This should fix web servers accessing shared folders.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

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

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

@@ -390 +390 @@
 
 struct file_operations sf_reg_fops = {
-        .read    = sf_reg_read,
-        .open    = sf_reg_open,
-        .write   = sf_reg_write,
-        .release = sf_reg_release,
-        .mmap    = sf_reg_mmap
+        .read     = sf_reg_read,
+        .open     = sf_reg_open,
+        .write    = sf_reg_write,
+        .release  = sf_reg_release,
+        .mmap     = sf_reg_mmap,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+        .sendfile = generic_file_sendfile,
+        .fsync    = simple_sync_file,
+#endif
 };
 

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

@@ -24 +24 @@
 /* #define USE_VMALLOC */
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+/*
+ * sf_aops and sf_backing_dev_info are just quick implementations to make
+ * sendfile work. For more information have a look at
+ *
+ *   http://us1.samba.org/samba/ftp/cifs-cvs/ols2006-fs-tutorial-smf.odp
+ *
+ * and the sample implementation
+ *
+ *   http://pserver.samba.org/samba/ftp/cifs-cvs/samplefs.tar.gz
+ */
+static struct address_space_operations sf_aops = {
+        .readpage      = simple_readpage,
+        .prepare_write = simple_prepare_write,
+        .commit_write  = simple_commit_write,
+};
+
+static struct backing_dev_info sf_backing_dev_info = {
+        .ra_pages      = 0, /* No readahead */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 12)
+        .capabilities  = BDI_CAP_MAP_DIRECT    /* MAP_SHARED */
+                       | BDI_CAP_MAP_COPY      /* MAP_PRIVATE */
+                       | BDI_CAP_READ_MAP      /* can be mapped for reading */
+                       | BDI_CAP_WRITE_MAP     /* can be mapped for writing */
+                       | BDI_CAP_EXEC_MAP,     /* can be mapped for execution */
+# endif
+};
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0) */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
 static void
@@ -76 +105 @@
         mode |= mode_set (IXOTH);
 #undef mode_set
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+        inode->i_mapping->a_ops = &sf_aops;
+        inode->i_mapping->backing_dev_info = &sf_backing_dev_info;
+#endif
 
         if (is_dir) {
@@ -95 +129 @@
         inode->i_gid = sf_g->gid;
         inode->i_size = info->cbObject;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) && !defined(KERNEL_FC6)
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 19) && !defined(KERNEL_FC6)
         inode->i_blksize = 4096;
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,11)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 11)
         inode->i_blkbits = 12;
 #endif

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

@@ -118 +118 @@
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) || defined(KERNEL_FC6)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 19) || defined(KERNEL_FC6)
 /* FC6 kernel 2.6.18, vanilla kernel 2.6.19+ */
 #define GET_INODE_INFO(i) ((struct sf_inode_info *) (i)->i_private)