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

Timestamp:

Jun 10, 2010 4:05:56 PM (15 years ago)

Author:

vboxsync

Message:

Linux shared folders: re-read the directory if a file was changed

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (3 diffs)
• utils.c (modified) (7 diffs)
• vfsmod.h (modified) (5 diffs)

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

@@ -122 +122 @@
         struct sf_glob_info *sf_g;
         struct sf_dir_info *sf_d;
+        struct sf_inode_info *sf_i;
+        struct inode *inode;
         struct list_head *pos, *list;
 
         TRACE ();
+
         sf_g = GET_GLOB_INFO (dir->f_dentry->d_inode->i_sb);
         sf_d = dir->private_data;
@@ -131 +134 @@
         BUG_ON (!sf_d);
 
+        inode = dir->f_dentry->d_inode;
+        sf_i = GET_INODE_INFO(inode);
+
+        BUG_ON (!sf_i);
+
+        if (sf_i->force_reread)
+        {
+                int rc;
+                int err;
+                SHFLCREATEPARMS params;
+ 
+                RT_ZERO(params);
+ 
+                params.CreateFlags = 0
+                                   | SHFL_CF_DIRECTORY
+                                   | SHFL_CF_ACT_OPEN_IF_EXISTS
+                                   | SHFL_CF_ACT_FAIL_IF_NEW
+                                   | SHFL_CF_ACCESS_READ
+                                   ;
+ 
+                LogFunc(("sf_getdent: calling vboxCallCreate, folder %s, flags %#x\n",
+                            sf_i->path->String.utf8, params.CreateFlags));
+                rc = vboxCallCreate (&client_handle, &sf_g->map, sf_i->path, &params);
+                if (RT_FAILURE (rc)) {
+                    LogRel(("open failed %d\n", rc));
+                    LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
+                                sf_i->path->String.utf8, rc));
+                    return -EPERM;
+                }
+ 
+                if (params.Result != SHFL_FILE_EXISTS) {
+                    LogRel(("not exist %x\n", params.Result));
+                    LogFunc(("directory %s does not exist\n", sf_i->path->String.utf8));
+                    sf_dir_info_free (sf_d);
+                    return -ENOENT;
+                }
+ 
+                sf_dir_info_empty (sf_d);
+                err = sf_dir_read_all (sf_g, sf_i, sf_d, params.Handle);
+                rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
+                if (RT_FAILURE (rc)) {
+                    LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n",
+                             sf_i->path->String.utf8, rc));
+                }
+                if (err)
+                    return err;
+                sf_i->force_reread = 0;
+        }
+ 
         cur = 0;
         list = &sf_d->info_list;
@@ -531 +583 @@
         }
 
+        /* directory access/change time changed */
+        sf_i->force_restat = 1;
+        /* directory content changed */
+        sf_i->force_reread = 1;
         kfree (path);
         return 0;

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

@@ -642 +642 @@
 }
 
+void
+sf_dir_info_empty(struct sf_dir_info *p)
+{
+        struct list_head *list, *pos, *tmp;
+        TRACE ();
+        list = &p->info_list;
+        list_for_each_safe (pos, tmp, list) {
+                struct sf_dir_buf *b;
+                b = list_entry (pos, struct sf_dir_buf, head);
+                b->nb_entries = 0;
+                b->used_bytes = 0;
+                b->free_bytes = 16384;
+        }
+}
+
 struct sf_dir_info *
 sf_dir_info_alloc (void)
@@ -659 +674 @@
 
 static struct sf_dir_buf *
-sf_get_non_empty_dir_buf (struct sf_dir_info *sf_d)
+sf_get_empty_dir_buf (struct sf_dir_info *sf_d)
 {
         struct list_head *list, *pos;
@@ -672 +687 @@
                 }
                 else {
-                        if (b->free_bytes > 0) {
+                        if (b->used_bytes == 0) {
                                 return b;
                         }
@@ -695 +710 @@
         }
 
-        b = sf_get_non_empty_dir_buf (sf_d);
         for (;;) {
                 int rc;
@@ -702 +716 @@
                 uint32_t nb_ents;
 
+                b = sf_get_empty_dir_buf (sf_d);
                 if (!b) {
                         b = sf_dir_buf_alloc ();
@@ -709 +724 @@
                                 goto fail1;
                         }
-                }
-
-                list_add (&b->head, &sf_d->info_list);
+                        list_add (&b->head, &sf_d->info_list);
+                }
 
                 buf = b->buf;
@@ -747 +761 @@
                 b->free_bytes -= buf_size;
                 b->used_bytes += buf_size;
-                b = NULL;
-
-                if (RT_FAILURE (rc)) {
+
+                if (RT_FAILURE (rc))
                         break;
-                }
         }
         return 0;

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

@@ -23 +23 @@
 #include "product-generated.h"
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 # include <linux/backing-dev.h>
 #endif
@@ -41 +41 @@
         int dmask;
         int fmask;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
         struct backing_dev_info bdi;
 #endif
@@ -52 +52 @@
         /* some information was changed, update data on next revalidate */
         int force_restat;
+        /* directory content changed, update the whole directory on next sf_getdent */
+        int force_reread;
         /* file structure, only valid between open() and release() */
         struct file *file;
@@ -87 +89 @@
 
 extern void
-sf_init_inode (struct sf_glob_info *sf_g, struct inode *inode,
-               RTFSOBJINFO *info);
-extern int
-sf_stat (const char *caller, struct sf_glob_info *sf_g,
-         SHFLSTRING *path, RTFSOBJINFO *result, int ok_to_fail);
-extern int
-sf_inode_revalidate (struct dentry *dentry);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
-extern int
-sf_getattr (struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat);
-extern int
-sf_setattr (struct dentry *dentry, struct iattr *iattr);
+sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
+              RTFSOBJINFO *info);
+extern int sf_stat(const char *caller, struct sf_glob_info *sf_g,
+                   SHFLSTRING *path, RTFSOBJINFO *result, int ok_to_fail);
+extern int sf_inode_revalidate(struct dentry *dentry);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+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
-sf_path_from_dentry (const char *caller, struct sf_glob_info *sf_g,
-                     struct sf_inode_info *sf_i, struct dentry *dentry,
-                     SHFLSTRING **result);
-extern int
-sf_nlscpy (struct sf_glob_info *sf_g,
-           char *name, size_t name_bound_len,
-           const unsigned char *utf8_name, size_t utf8_len);
-extern void
-sf_dir_info_free (struct sf_dir_info *p);
-extern struct sf_dir_info *
-sf_dir_info_alloc (void);
-extern int
-sf_dir_read_all (struct sf_glob_info *sf_g, struct sf_inode_info *sf_i,
-                 struct sf_dir_info *sf_d, SHFLHANDLE handle);
-extern int
-sf_init_backing_dev (struct sf_glob_info *sf_g, const char *name);
-extern void
-sf_done_backing_dev (struct sf_glob_info *sf_g);
+extern int sf_path_from_dentry(const char *caller, struct sf_glob_info *sf_g,
+                               struct sf_inode_info *sf_i, struct dentry *dentry,
+                               SHFLSTRING **result);
+extern int sf_nlscpy(struct sf_glob_info *sf_g,
+                     char *name, size_t name_bound_len,
+                     const unsigned char *utf8_name, size_t utf8_len);
+extern void sf_dir_info_free(struct sf_dir_info *p);
+extern void sf_dir_info_empty(struct sf_dir_info *p);
+extern struct sf_dir_info *sf_dir_info_alloc(void);
+extern int sf_dir_read_all(struct sf_glob_info *sf_g, struct sf_inode_info *sf_i,
+                           struct sf_dir_info *sf_d, SHFLHANDLE handle);
+extern int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name);
+extern void sf_done_backing_dev(struct sf_glob_info *sf_g);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 #define STRUCT_STATFS  struct statfs
 #else
@@ -137 +130 @@
 /* Following casts are here to prevent assignment of void * to
    pointers of arbitrary type */
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 #define GET_GLOB_INFO(sb) ((struct sf_glob_info *) (sb)->u.generic_sbp)
 #define SET_GLOB_INFO(sb, sf_g) (sb)->u.generic_sbp = sf_g