hammer2 - Cleanup master
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 23 Aug 2017 04:27:21 +0000 (21:27 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 23 Aug 2017 04:27:21 +0000 (21:27 -0700)
* Cleanup two debug messages that are no longer needed.

sys/vfs/hammer2/hammer2_inode.c
sys/vfs/hammer2/hammer2_xops.c

index 44d0402..a14c78b 100644 (file)
@@ -1474,10 +1474,13 @@ again:
                error = EIO;
                goto done;
        }
+
+       /*
+        * The inode chain is unlocked so the parent can change inbetween
+        * the two calls.  Detect the situation and retry.  This case can
+        * occur quite often under heavy lods.
+        */
        if (chain->parent != parent) {
-               kprintf("hammer2_inode_xop_destroy: "
-                       "parent changed %p->(%p,%p)\n",
-                       chain, parent, chain->parent);
                hammer2_chain_unlock(parent);
                hammer2_chain_drop(parent);
                hammer2_chain_unlock(chain);
@@ -1485,6 +1488,9 @@ again:
                goto again;
        }
 
+       /*
+        * We have the correct parent, we can issue the deletion.
+        */
        hammer2_chain_delete(parent, chain, xop->head.mtid, 0);
        error = 0;
 done:
index 6c19f26..f4eed82 100644 (file)
@@ -98,8 +98,6 @@ checkdirempty(hammer2_chain_t *oparent, hammer2_chain_t *ochain, int clindex)
                                        hammer2_chain_unlock(chain);
                                        hammer2_chain_drop(chain);
                                }
-                               kprintf("H2EAGAIN\n");
-
                                return EAGAIN;
                        }
                }