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

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

File:

• trunk/src/VBox/Additions/linux/sharedfolders/utils.c (modified) (7 diffs)

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;