Changeset 20342 in vbox for trunk/src/VBox/Additions/linux/sharedfolders

Timestamp:

Jun 5, 2009 3:36:59 PM (16 years ago)

Author:

vboxsync

Message:

Linux shared folders: make chmod work on hosts which support file mode setting and follow the file mode when creating new files / directories

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

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

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

@@ -392 +392 @@
 
 static int
-sf_create_aux (struct inode *parent, struct dentry *dentry, int dirop)
+sf_create_aux (struct inode *parent, struct dentry *dentry, int mode, int dirop)
 {
         int rc, err;
@@ -410 +410 @@
 
         memset(&params, 0, sizeof(params));
+        /* Ensure that the shared folders host service is using our fMode
+         * paramter */
+        params.Handle = SHFL_HANDLE_NIL;
 
         params.CreateFlags = 0
@@ -420 +423 @@
         params.Info.Attr.fMode = 0
                 | (dirop ? RTFS_TYPE_DIRECTORY : RTFS_TYPE_FILE)
-                | RTFS_UNIX_IRUSR
-                | RTFS_UNIX_IWUSR
-                | RTFS_UNIX_IXUSR
+                | (mode & S_IRWXUGO)
                 ;
 
@@ -487 +488 @@
 {
         TRACE ();
-        return sf_create_aux (parent, dentry, 0);
+        return sf_create_aux (parent, dentry, mode, 0);
 }
 
@@ -494 +495 @@
 {
         TRACE ();
-        return sf_create_aux (parent, dentry, 1);
+        return sf_create_aux (parent, dentry, mode, 1);
 }
 
@@ -607 +608 @@
         .revalidate = sf_inode_revalidate
 #else
-        .getattr    = sf_getattr
+        .getattr    = sf_getattr,
+        .setattr    = sf_setattr
 #endif
 };

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

@@ -219 +219 @@
 
         memset(&params, 0, sizeof(params));
-        /* params.Handle is now 0. We check this afterwards to find out if
+        params.Handle = SHFL_HANDLE_NIL;
+        /* We check the value of params.Handle afterwards to find out if
          * the call succeeded or failed, as the API does not seem to cleanly
-         * distinguish error and informational messages. */
+         * distinguish error and informational messages.
+         *
+         * Furthermore, we must set params.Handle to SHFL_HANDLE_NIL to
+         * make the shared folders host service use our fMode parameter */
 
         if (file->f_flags & O_CREAT) {
@@ -265 +269 @@
         }
 
+        params.Info.Attr.fMode = inode->i_mode;
         LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%d, %#x\n",
                  sf_i->path->String.utf8 , file->f_flags, params.CreateFlags));
@@ -453 +458 @@
         .revalidate = sf_inode_revalidate
 #else
-        .getattr    = sf_getattr
+        .getattr    = sf_getattr,
+        .setattr    = sf_setattr
 #endif
 };

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

@@ -61 +61 @@
         *time = t;
 }
-#else
+
+static void
+sf_timespec_from_ftime (RTTIMESPEC *ts, time_t *time)
+{
+        int64_t t = 1000000000 * *time;
+        RTTimeSpecSetNano (ts, t);
+}
+#else /* >= 2.6.0 */
 static void
 sf_ftime_from_timespec (struct timespec *tv, RTTIMESPEC *ts)
@@ -72 +79 @@
         tv->tv_nsec = nsec;
 }
-#endif
+
+static void
+sf_timespec_from_ftime (RTTIMESPEC *ts, struct timespec *tv)
+{
+        int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
+        RTTimeSpecSetNano (ts, t);
+}
+#endif /* >= 2.6.0 */
 
 /* set [inode] attributes based on [info], uid/gid based on [sf_g] */
@@ -233 +247 @@
 sf_dentry_revalidate (struct dentry *dentry, int flags)
 #else
-        sf_dentry_revalidate (struct dentry *dentry, struct nameidata *nd)
+sf_dentry_revalidate (struct dentry *dentry, struct nameidata *nd)
 #endif
 {
@@ -260 +274 @@
 
         generic_fillattr (dentry->d_inode, kstat);
+        printk("getattr %08x\n", kstat->mode);
         return 0;
 }
-#endif
+
+int
+sf_setattr (struct dentry *dentry, struct iattr *iattr)
+{
+        struct sf_glob_info *sf_g;
+        struct sf_inode_info *sf_i;
+        SHFLCREATEPARMS params;
+        RTFSOBJINFO info;
+        uint32_t cbBuffer;
+        int rc, err;
+
+        TRACE ();
+
+        sf_g = GET_GLOB_INFO (dentry->d_inode->i_sb);
+        sf_i = GET_INODE_INFO (dentry->d_inode);
+        err  = 0;
+
+        memset(&params, 0, sizeof(params));
+        memset(&info, 0, sizeof(info));
+
+        params.CreateFlags = SHFL_CF_ACT_OPEN_IF_EXISTS
+                           | SHFL_CF_ACT_FAIL_IF_NEW;
+
+        rc = vboxCallCreate (&client_handle, &sf_g->map, sf_i->path, &params);
+        if (VBOX_FAILURE (rc)) {
+                LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
+                        sf_i->path->String.utf8, rc));
+                err = -RTErrConvertToErrno(rc);
+                goto fail2;
+        }
+        if (params.Result != SHFL_FILE_EXISTS) {
+                LogFunc(("file %s does not exist\n", sf_i->path->String.utf8));
+                err = -ENOENT;
+                goto fail1;
+        }
+
+        cbBuffer = sizeof(info);
+
+#define mode_set(r) ((iattr->ia_mode & (S_##r)) ? RTFS_UNIX_##r : 0)
+
+        if (iattr->ia_valid & ATTR_MODE)
+        {
+            info.Attr.fMode  = mode_set (ISUID);
+            info.Attr.fMode |= mode_set (ISGID);
+            info.Attr.fMode |= mode_set (IRUSR);
+            info.Attr.fMode |= mode_set (IWUSR);
+            info.Attr.fMode |= mode_set (IXUSR);
+            info.Attr.fMode |= mode_set (IRGRP);
+            info.Attr.fMode |= mode_set (IWGRP);
+            info.Attr.fMode |= mode_set (IXGRP);
+            info.Attr.fMode |= mode_set (IROTH);
+            info.Attr.fMode |= mode_set (IWOTH);
+            info.Attr.fMode |= mode_set (IXOTH);
+
+            if (iattr->ia_mode & S_IFDIR)
+                info.Attr.fMode |= RTFS_TYPE_DIRECTORY;
+            else
+                info.Attr.fMode |= RTFS_TYPE_FILE;
+        }
+
+        if (iattr->ia_valid & ATTR_ATIME)
+            sf_timespec_from_ftime (&info.AccessTime, &iattr->ia_atime);
+        if (iattr->ia_valid & ATTR_MTIME)
+            sf_timespec_from_ftime (&info.ModificationTime, &iattr->ia_mtime);
+        /* ignore ctime (inode change time) as it can't be set from userland anyway */
+
+        rc = vboxCallFSInfo(&client_handle, &sf_g->map, params.Handle,
+                            SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer,
+                            (PSHFLDIRINFO)&info);
+        if (VBOX_FAILURE (rc)) {
+                LogFunc(("vboxCallFSInfo(%s) failed rc=%Rrc\n",
+                        sf_i->path->String.utf8, rc));
+                err = -RTErrConvertToErrno(rc);
+                goto fail1;
+        }
+        
+        rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
+        if (VBOX_FAILURE (rc)) {
+                LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n",
+                      sf_i->path->String.utf8, rc));
+        }
+
+        return sf_inode_revalidate (dentry);
+
+fail1:
+        rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
+        if (VBOX_FAILURE (rc)) {
+                LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n",
+                      sf_i->path->String.utf8, rc));
+        }
+fail2:
+        return err;
+}
+#endif /* >= 2.6.0 */
 
 static int

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

@@ -85 +85 @@
 extern int
 sf_getattr (struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat);
+extern int
+sf_setattr (struct dentry *dentry, struct iattr *iattr);
 #endif
 extern int