From 22f42657aa52d54b412c4be81e9e6bb3d494792a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Sat, 19 Apr 2008 22:16:50 -0700
Subject: [PATCH] kclient: remove dput debug crap

---
 src/kernel/dir.c        |  9 +++------
 src/kernel/inode.c      | 14 +++-----------
 src/kernel/mds_client.c | 11 ++---------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index feb31405b7a91..a95348f2124c5 100644
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -210,10 +210,7 @@ int ceph_do_lookup(struct super_block *sb, struct dentry *dentry, int mask,
 	if (dentry->d_name.len > NAME_MAX)
 		return -ENAMETOOLONG;
 
-	dout(10, "do_lookup %p %d mask %d\n", dentry, dentry->d_count, mask);
-	if (atomic_read(&dentry->d_count) > 1) {
-		dout(10, "hey!\n");
-	}
+	dout(10, "do_lookup %p mask %d\n", dentry, mask);
 	if (on_inode) {
 		/* stat ino directly */
 		req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_LSTAT,
@@ -242,7 +239,7 @@ int ceph_do_lookup(struct super_block *sb, struct dentry *dentry, int mask,
 		d_add(dentry, NULL);
 		err = 0;
 	}
-	dout(20, "do_lookup %p %d result=%d\n", dentry, dentry->d_count, err);
+	dout(20, "do_lookup %p result=%d\n", dentry, err);
 	return err;
 }
 
@@ -521,7 +518,7 @@ static int ceph_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
 	struct inode *dir = dentry->d_parent->d_inode;
 
-	dout(10, "d_revalidate %p %d '%.*s' inode %p\n", dentry, dentry->d_count,
+	dout(10, "d_revalidate %p '%.*s' inode %p\n", dentry,
 	     dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
 	dout(10, "nd flags %d chdir=%d\n", nd->flags, nd->flags & LOOKUP_CHDIR);
 
diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 700f1547a7da1..3b4c099421f60 100644
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -513,24 +513,17 @@ retry_lookup:
 		}
 		ceph_update_inode_lease(dn->d_inode, rinfo->trace_ilease[d+1],
 					session, req->r_from_time);
-		dout(10, "dput %p %d\n", parent, parent->d_count);
 		dput(parent);
 		parent = NULL;
 	}
-	if (parent) {
-		dout(10, "dput %p %d\n", parent, parent->d_count);
+	if (parent)
 		dput(parent);
-	}
 
 	dout(10, "fill_trace done, last dn %p in %p\n", dn, in);
-	if (req->r_old_dentry) {
-		dout(10, "dput %p %d\n", req->r_old_dentry, req->r_old_dentry->d_count);
+	if (req->r_old_dentry)
 		dput(req->r_old_dentry);
-	}
-	if (req->r_last_dentry) {
-		dout(10, "dput %p %d\n", req->r_last_dentry, req->r_last_dentry->d_count);
+	if (req->r_last_dentry)
 		dput(req->r_last_dentry);
-	}
 	if (req->r_last_inode)
 		iput(req->r_last_inode);
 	req->r_last_dentry = dn;
@@ -609,7 +602,6 @@ retry_lookup:
 					 req->r_session, req->r_from_time);
 		ceph_update_inode_lease(in, rinfo->dir_ilease[i],
 					req->r_session, req->r_from_time);
-		dout(10, "dput %p %d\n", dn, dn->d_count);
 		dput(dn);
 	}
 	dout(10, "readdir_prepopulate done\n");
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 704936555a568..5699de8e108c8 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -373,10 +373,8 @@ void ceph_mdsc_put_request(struct ceph_mds_request *req)
 			put_session(req->r_session);
 		if (req->r_last_inode)
 			iput(req->r_last_inode);
-		if (req->r_last_dentry) {
+		if (req->r_last_dentry)
 			dput(req->r_last_dentry);
-			dout(10, "dput %p %d\n", req->r_last_dentry, req->r_last_dentry->d_count);
-		}
 		drop_request_session_attempt_refs(req);
 		kfree(req);
 	}
@@ -636,10 +634,8 @@ void revoke_dentry_lease(struct dentry *dentry)
 		dentry->d_fsdata = 0;
 	}
 	spin_unlock(&dentry->d_lock);
-	if (drop) {
-		dout(10, "lease dput on %p %d\n", dentry, dentry->d_count);
+	if (drop)
 		dput(dentry);
-	}
 }
 
 /*
@@ -710,7 +706,6 @@ static void trim_session_leases(struct ceph_mds_session *session)
 		kfree(di);
 		dentry->d_fsdata = 0;
 		spin_unlock(&dentry->d_lock);
-		dout(10, "dput %p %d\n", dentry, dentry->d_count);
 		dput(dentry);
 	}
 }
@@ -1251,7 +1246,6 @@ retry:
 		ceph_decode_need(&p, end, pathlen+4, needmore);
 		ceph_encode_string(&p, end, path, pathlen);
 		kfree(path);
-		dout(10, "dput %p %d\n", dentry, dentry->d_count);
 		dput(dentry);
 		count++;
 	}
@@ -1554,7 +1548,6 @@ void ceph_mdsc_handle_lease(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
 			goto release;
 		revoke_dentry_lease(dentry);
 		dout(10, "lease revoked on dentry %p\n", dentry);
-		dout(10, "dput %p %d\n", dentry, dentry->d_count);
 		dput(dentry);
 	}
 
-- 
2.39.5