From: Sage Weil <sage@inktank.com>
Date: Tue, 2 Jul 2013 00:45:54 +0000 (-0700)
Subject: client: make less noise when unlinking during readdir
X-Git-Tag: v0.81~19^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3eb2a77442d8e1f5e3ff940a2c35f39a949181d2;p=ceph.git

client: make less noise when unlinking during readdir

Skip, but do not talk about, NULL dentries.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index eb09f1b949727..cb772f9be8a63 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -910,10 +910,14 @@ void Client::insert_readdir_results(MetaRequest *request, MetaSession *session,
       while (pd != dir->dentry_map.end() && pd->first < dname) {
 	if (pd->first < dname &&
 	    fg.contains(diri->hash_dentry_name(pd->first))) {  // do not remove items in earlier frags
-	  ldout(cct, 15) << "insert_trace  unlink '" << pd->first << "'" << dendl;
 	  Dentry *dn = pd->second;
-	  ++pd;
-	  unlink(dn, true, true);  // keep dir, dentry
+	  if (dn->inode) {
+	    ldout(cct, 15) << "insert_trace  unlink '" << pd->first << "'" << dendl;
+	    ++pd;
+	    unlink(dn, true, true);  // keep dir, dentry
+	  } else {
+	    ++pd;
+	  }
 	} else {
 	  ++pd;
 	}