Changeset 31981 in vbox for trunk/src

Timestamp:

Aug 26, 2010 11:40:06 AM (14 years ago)

Author:

vboxsync

Message:

Additions/Solaris/SharedFolders: Fixed truncating files to 2G on 32-bit guests.

File:

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

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

@@ -712 +712 @@
         *eofp = 0;
 
-        if (uiop->uio_loffset >= MAXOFF_T) {
+        if (uiop->uio_loffset >= MAXOFFSET_T) {
                 *eofp = 1;
                 return (0);
@@ -963 +963 @@
         if (vp->v_type != VREG)
                 return (EINVAL);
-        if (uio->uio_loffset >= MAXOFF_T)
-                return (0);
+        if (uio->uio_loffset >= MAXOFFSET_T)
+        {
+                proc_t *p = ttoproc(curthread);
+                mutex_enter(&p->p_lock);
+                (void) rctl_action(rctlproc_legacy[RLIMIT_FSIZE], p->p_rctls,
+                        p, RCA_UNSAFE_SIGINFO);
+                mutex_exit(&p->p_lock);
+                return (EFBIG);
+        }
         if (uio->uio_loffset < 0)
                 return (EINVAL);
@@ -1051 +1058 @@
         if (limit == RLIM64_INFINITY || limit > MAXOFFSET_T)
                 limit = MAXOFFSET_T;
-        if (limit > MAXOFF_T)
-                limit = MAXOFF_T;
 
         if (uiop->uio_loffset >= limit) {
@@ -1064 +1069 @@
         }
 
-        if (uiop->uio_loffset >= MAXOFF_T) {
+        if (uiop->uio_loffset >= MAXOFFSET_T) {
                 mutex_exit(&sffs_lock);
                 return (EFBIG);