Changeset 6054 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Dec 12, 2007 12:42:44 PM (17 years ago)

Author:

vboxsync

Message:

vboxvfs: implemented readfile()

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

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

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

@@ -345 +345 @@
         buf = kmap (page);
         off = (vaddr - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
-
         err = sf_reg_read_aux (__func__, sf_g, sf_r, buf, &nread, off);
         if (err) {
@@ -390 +389 @@
 
 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,
+        .aio_read    = generic_file_aio_read,
+        .open        = sf_reg_open,
+        .write       = sf_reg_write,
+        .aio_write   = generic_file_aio_write,
+        .release     = sf_reg_release,
+        .mmap        = sf_reg_mmap,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
 # if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 23)
         .splice_read = generic_file_splice_read,
 # else
-        .sendfile = generic_file_sendfile,
+        .sendfile    = generic_file_sendfile,
 # endif
-        .fsync    = simple_sync_file,
+        .fsync       = simple_sync_file,
+        .llseek      = generic_file_llseek,
 #endif
 };
 
-
-/* iops */
 
 struct inode_operations sf_reg_iops = {
@@ -415 +415 @@
 #endif
 };
+
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+static int
+sf_readpage(struct file *file, struct page *page)
+{
+        char *buf = kmap(page);
+        struct inode *inode = file->f_dentry->d_inode;
+        struct sf_glob_info *sf_g = GET_GLOB_INFO (inode->i_sb);
+        struct sf_reg_info *sf_r = file->private_data;
+        uint32_t nread = PAGE_SIZE;
+        loff_t off = page->index << PAGE_SHIFT;
+        int ret;
+
+        TRACE ();
+
+        ret = sf_reg_read_aux (__func__, sf_g, sf_r, buf, &nread, off);
+        if (ret) {
+            kunmap (page);
+            return ret;
+        }
+        flush_dcache_page (page);
+        kunmap (page);
+        SetPageUptodate(page);
+        if (PageLocked(page))
+            unlock_page(page);
+        return 0;
+}
+
+struct address_space_operations sf_reg_aops = {
+        .readpage      = sf_readpage,
+# if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 24)
+        .write_begin   = simple_write_begin,
+        .write_end     = simple_write_end,
+# else
+        .prepare_write = simple_prepare_write,
+        .commit_write  = simple_commit_write,
+# endif
+};
+#endif

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

@@ -26 +26 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
 /*
- * sf_aops and sf_backing_dev_info are just quick implementations to make
+ * sf_reg_aops and sf_backing_dev_info are just quick implementations to make
  * sendfile work. For more information have a look at
  *
@@ -35 +35 @@
  *   http://pserver.samba.org/samba/ftp/cifs-cvs/samplefs.tar.gz
  */
-static struct address_space_operations sf_aops = {
-        .readpage      = simple_readpage,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 24)
-        .write_begin   = simple_write_begin,
-        .write_end     = simple_write_end,
-#else
-        .prepare_write = simple_prepare_write,
-        .commit_write  = simple_commit_write,
-#endif
-};
 
 static struct backing_dev_info sf_backing_dev_info = {
@@ -112 +102 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
-        inode->i_mapping->a_ops = &sf_aops;
+        inode->i_mapping->a_ops = &sf_reg_aops;
         inode->i_mapping->backing_dev_info = &sf_backing_dev_info;
 #endif

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

@@ -393 +393 @@
 init (void)
 {
-        int rc;
+        int rcVBox;
+        int rcRet = 0;
         int err;
 
@@ -404 +405 @@
                         sizeof (struct vbsf_mount_info),
                         PAGE_SIZE);
+                return -EINVAL;
         }
 
@@ -413 +415 @@
 
         if (vboxadd_cmc_ctl_guest_filter_mask (VMMDEV_EVENT_HGCM, 0)) {
+                rcRet = -EINVAL;
                 goto fail0;
         }
 
-        rc = vboxInit ();
-        if (VBOX_FAILURE (rc)) {
-                LogRelFunc (("vboxInit failed, rc=%d\n", rc));
+        rcVBox = vboxInit ();
+        if (VBOX_FAILURE (rcVBox)) {
+                LogRelFunc (("vboxInit failed, rc=%d\n", rcVBox));
+                rcRet = -EPROTO;
                 goto fail0;
         }
 
-        rc = vboxConnect (&client_handle);
-        if (VBOX_FAILURE (rc)) {
-                LogRelFunc (("vboxConnect failed, rc=%d\n", rc));
+        rcVBox = vboxConnect (&client_handle);
+        if (VBOX_FAILURE (rcVBox)) {
+                LogRelFunc (("vboxConnect failed, rc=%d\n", rcVBox));
+                rcRet = -EPROTO;
                 goto fail1;
         }
 
-        rc = vboxCallSetUtf8 (&client_handle);
-        if (VBOX_FAILURE (rc)) {
-                LogRelFunc (("vboxCallSetUtf8 failed, rc=%d\n", rc));
+        rcVBox = vboxCallSetUtf8 (&client_handle);
+        if (VBOX_FAILURE (rcVBox)) {
+                LogRelFunc (("vboxCallSetUtf8 failed, rc=%d\n", rcVBox));
+                rcRet = -EPROTO;
                 goto fail2;
         }
@@ -447 +453 @@
         vboxadd_cmc_ctl_guest_filter_mask (0, VMMDEV_EVENT_HGCM);
         unregister_filesystem (&vboxsf_fs_type);
-        return -1;
+        return rcRet;
 }
 

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

@@ -59 +59 @@
 
 /* forward declarations */
-extern struct inode_operations  sf_dir_iops;
-extern struct inode_operations  sf_reg_iops;
-extern struct file_operations   sf_dir_fops;
-extern struct file_operations   sf_reg_fops;
-extern struct dentry_operations sf_dentry_ops;
+extern struct inode_operations         sf_dir_iops;
+extern struct inode_operations         sf_reg_iops;
+extern struct file_operations          sf_dir_fops;
+extern struct file_operations          sf_reg_fops;
+extern struct dentry_operations        sf_dentry_ops;
+extern struct address_space_operations sf_reg_aops;
 
 extern void