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

Timestamp:

Oct 5, 2011 1:51:28 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74309

Message:

Additions/solaris/SharedFolders: mmap related clarifications.

File:

• trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c (modified) (5 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c

@@ -1551 +1551 @@
                 if (error != 0)
                 {
-                        cmn_err(CE_WARN, "sffs_readpages: sfprov_read() failed. error=%d bytes=%ld\n", error, bytes);
+                        cmn_err(CE_WARN, "sffs_readpages: sfprov_read() failed. error=%d bytes=%u\n", error, bytes);
                         /* Get rid of all kluster pages read & bail.  */
-                        pvn_read_done(ppages,  B_ERROR);
+                        pvn_read_done(ppages, B_ERROR);
                         return (error);
                 }
@@ -1700 +1700 @@
 {
         /*
-         * We don't support PROT_WRITE mmaps. Just pretend we're done writing back
-         * to the disk while unmounting/closing the node and discarding the mapped pages.
+         * This would not get invoked i.e. via pvn_vplist_dirty() since we don't support
+         * PROT_WRITE mmaps and therefore will not have dirty pages.
          */
         pvn_write_done(ppage, B_INVAL | B_ERROR | B_FORCE);
@@ -1809 +1809 @@
         )
 {
-        sfnode_t *node = VN2SFN(dvp);
-        uint64_t npages = btopr(len);
-
         if (dvp->v_flag & VNOMAP)
                 return (ENOSYS);
-
-        ASSERT(node);
         return (0);
 }
@@ -1837 +1832 @@
         )
 {
-        sfnode_t *node = VN2SFN(dvp);
-        uint64_t npages = btopr(len);
-
         if (dvp->v_flag & VNOMAP)
                 return (ENOSYS);
-
         return (0);
 }
@@ -2026 +2017 @@
                 /* We're fine with releasing the vnode lock here as we should be covered by the sffs_lock */
                 mutex_exit(&vp->v_lock);
+                /* We won't have any dirty pages, this will just invalidate (destroy) the pages and move it to the cachelist. */
                 pvn_vplist_dirty(vp, 0 /* offset */, sffs_discardpage, B_INVAL, cr);
                 mutex_enter(&vp->v_lock);