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

Timestamp:

Mar 3, 2019 4:42:04 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Some cleanups and logging in dirops.c. bugref:9172

File:

• trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (modified) (9 diffs)

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

@@ -34 +34 @@
 
 /**
- * Open a directory.
- *
- * @param inode     inode
- * @param file      file
- * @returns 0 on success, Linux error code otherwise
+ * Open a directory (implements file_operations::open).
+ *
+ * @returns 0 on success, negative errno otherwise.
+ * @param   inode   inode
+ * @param   file    file
  */
 static int vbsf_dir_open(struct inode *inode, struct file *file)
 {
-    struct vbsf_super_info *sf_g = VBSF_GET_SUPER_INFO(inode->i_sb);
-    struct vbsf_inode_info *sf_i = VBSF_GET_INODE_INFO(inode);
+    struct vbsf_super_info *sf_g   = VBSF_GET_SUPER_INFO(inode->i_sb);
+    struct vbsf_inode_info *sf_i   = VBSF_GET_INODE_INFO(inode);
     struct dentry          *dentry = VBSF_GET_F_DENTRY(file);
     struct vbsf_dir_info   *sf_d;
@@ -98 +98 @@
                     file->private_data = sf_d;
                     VbglR0PhysHeapFree(pReq);
+                    SFLOGFLOW(("vbsf_dir_open(%p,%p): returns 0; hHost=%#llx\n", inode, file, sf_d->Handle.hHost));
                     return 0;
 
@@ -123 +124 @@
     } else
         rc = -ENOMEM;
+    SFLOGFLOW(("vbsf_dir_open(%p,%p): returns %d\n", inode, file, rc));
     return rc;
 }
@@ -140 +142 @@
     struct vbsf_dir_info *sf_d = (struct vbsf_dir_info *)file->private_data;
 
-    TRACE();
+    SFLOGFLOW(("vbsf_dir_release(%p,%p): sf_d=%p hHost=%#llx\n", inode, file, sf_d, sf_d ? sf_d->Handle.hHost : SHFL_HANDLE_NIL));
 
     if (sf_d) {
@@ -166 +168 @@
 /**
  * Translate RTFMODE into DT_xxx (in conjunction to rtDirType()).
- * @param fMode     file mode
  * returns d_type
- */
-static int vbsf_get_d_type(RTFMODE fMode)
+ * @param  fMode    file mode
+ */
+DECLINLINE(int) vbsf_get_d_type(RTFMODE fMode)
 {
     switch (fMode & RTFS_TYPE_MASK) {
@@ -200 +202 @@
      */
     if (sf_d->fNoMoreFiles) {
-        if (!fRestart)
+        if (!fRestart) {
+            SFLOGFLOW(("vbsf_dir_read_more: no more files\n"));
             return 0;
+        }
         sf_d->fNoMoreFiles = false;
     }
-
 
     /*
@@ -257 +260 @@
     } else
         rc = -ENOMEM;
+    SFLOGFLOW(("vbsf_dir_read_more: returns %d; cbValid=%#x cEntriesLeft=%#x fNoMoreFiles=%d\n",
+               rc, sf_d->cbValid, sf_d->cEntriesLeft, sf_d->fNoMoreFiles));
     return rc;
 }
@@ -282 +287 @@
 #endif
     }
+
     /* Assuming this is a buffer overflow issue, just silently skip it. */
+    SFLOGFLOW(("vbsf_dir_emit_nls: vbsf_nlscopy failed with %d for '%s'\n", rc, pszSrcName));
     return true;
 }
@@ -317 +324 @@
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-    loff_t                  offPos  = ctx->pos;
-#else
-    loff_t                  offPos  = dir->f_pos;
-#endif
-    struct vbsf_dir_info   *sf_d    = (struct vbsf_dir_info *)dir->private_data;
-    struct vbsf_super_info *sf_g    = VBSF_GET_SUPER_INFO(VBSF_GET_F_DENTRY(dir)->d_sb);
+    loff_t                  offPos = ctx->pos;
+#else
+    loff_t                  offPos = dir->f_pos;
+#endif
+    struct vbsf_dir_info   *sf_d   = (struct vbsf_dir_info *)dir->private_data;
+    struct vbsf_super_info *sf_g   = VBSF_GET_SUPER_INFO(VBSF_GET_F_DENTRY(dir)->d_sb);
     int                     rc;