Ticket #3124: fix_dirent-line-numbers.diff

vfs.cpp

@@ -5461 +5461 @@
 fix_dirent(struct vnode *parent, struct dirent *userEntry,
     struct io_context* ioContext, uint32* _length)
 {
+#define lnd do { ktrace_printf("fix_dirent: %d\n", __LINE__); } while(0)
     char buffer[sizeof(struct dirent) + B_FILE_NAME_LENGTH];
     struct dirent* entry;
 
     if (IS_USER_ADDRESS(userEntry)) {
+      lnd;
         entry = (struct dirent*)buffer;
         if (user_memcpy(entry, userEntry, sizeof(struct dirent) - 1) != B_OK)
             return B_BAD_ADDRESS;
@@ -5476 +5478 @@
             return B_BAD_ADDRESS;
     } else
         entry = userEntry;
+   lnd;
 
     *_length = entry->d_reclen;
 
     // set d_pdev and d_pino
     entry->d_pdev = parent->device;
     entry->d_pino = parent->id;
+   lnd;
 
     // If this is the ".." entry and the directory is the root of a FS,
     // we need to replace d_dev and d_ino with the actual values.
     if (strcmp(entry->d_name, "..") == 0
         && parent->mount->root_vnode == parent
         && parent->mount->covers_vnode) {
+      lnd;
         inc_vnode_ref_count(parent);
             // vnode_path_to_vnode() puts the node
 
         // Make sure the IO context root is not bypassed.
         if (parent == ioContext->root) {
+         lnd;
             entry->d_dev = parent->device;
             entry->d_ino = parent->id;
         } else {
+         lnd;
             // ".." is guaranteed not to be clobbered by this call
             struct vnode *vnode;
             status_t status = vnode_path_to_vnode(parent, (char*)"..", false, 0,
@@ -5507 +5514 @@
             }
         }
     } else {
+      lnd;
         // resolve mount points
         struct vnode *vnode = NULL;
         status_t status = get_vnode(entry->d_dev, entry->d_ino, &vnode, true,
@@ -5514 +5522 @@
         if (status != B_OK)
             return status;
 
+      lnd;
         mutex_lock(&sVnodeCoveredByMutex);
         if (vnode->covered_by) {
             entry->d_dev = vnode->covered_by->device;
@@ -5522 +5531 @@
         mutex_unlock(&sVnodeCoveredByMutex);
 
         put_vnode(vnode);
+      lnd;
     }
+   lnd;
 
     // copy back from userland buffer if needed
     if (entry != userEntry)
-        return user_memcpy(userEntry, entry, sizeof(struct dirent) - 1);
+   {
+      status_t st;
+      lnd;
+        st= user_memcpy(userEntry, entry, sizeof(struct dirent) - 1);
+      lnd;
+      return st;
+   }
 
+   lnd;
     return B_OK;
+#undef lnd
 }