From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Mon, 22 Jul 2002 23:14:52 +0000 (+0000)
Subject: make it work for 2.2 kernels also
X-Git-Tag: openafs-stable-1_2_6~33
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3e5b2fdde881c7a499d66acccf88efccee4dc210;p=packages%2Fo%2Fopenafs.git

make it work for 2.2 kernels also
also some debugging


(cherry picked from commit 73cdd10a1b5bda70cb0a1f6299c3cc570ac97b69)
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 4c1e872d5..9bc7d95d5 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -808,17 +808,23 @@ static int afs_linux_dentry_revalidate(struct dentry *dp)
 /* afs_dentry_iput */
 static void afs_dentry_iput(struct dentry *dp, struct inode *ip)
 {
+    afs_Trace3(afs_iclSetp, CM_TRACE_DENTRYIPUT,
+	       ICL_TYPE_POINTER, ip,
+	       ICL_TYPE_STRING, dp->d_parent->d_name.name,
+	       ICL_TYPE_STRING, dp->d_name.name);
+
     osi_iput(ip);
 }
 
 static int afs_dentry_delete(struct dentry *dp)
 {
-    if (dp->d_inode && (ITOAFS(dp->d_inode)->states & CUnlinked))
-	return 1;               /* bad inode? */
-
     afs_Trace3(afs_iclSetp, CM_TRACE_DENTRYDELETE, ICL_TYPE_POINTER, 
 	       dp->d_inode, ICL_TYPE_STRING, dp->d_parent->d_name.name,
 	       ICL_TYPE_STRING, dp->d_name.name);
+
+    if (dp->d_inode && (ITOAFS(dp->d_inode)->states & CUnlinked))
+	return 1;               /* bad inode? */
+
     return 0;
 }
 
@@ -834,7 +840,7 @@ struct dentry_operations afs_dentry_operations = {
 	afs_linux_dentry_revalidate,	/* d_validate(struct dentry *) */
 	NULL,			/* d_hash */
 	NULL,			/* d_compare */
-	NULL,			/* d_delete(struct dentry *) */
+	afs_dentry_delete,	/* d_delete(struct dentry *) */
 	NULL,			/* d_release(struct dentry *) */
 	afs_dentry_iput		/* d_iput(struct dentry *, struct inode *) */
 };
diff --git a/src/afs/afs_trace.et b/src/afs/afs_trace.et
index 0442c2a93..2b9658304 100644
--- a/src/afs/afs_trace.et
+++ b/src/afs/afs_trace.et
@@ -129,7 +129,8 @@ error_table 2 ZCM
 	ec	CM_TRACE_VM_CLOSE, "VMclose ip 0x%lx mapcnt %d opens %d XoW %d"
 	ec      CM_TRACE_PREFETCHCMD, "PrefetchCmd tvc 0x%x tfid (%d:%d.%d.%d) fid (%d:%d.%d.%d)"
 	ec      CM_TRACE_RESIDCMD, "ResidencyCmd tvc 0x%x command %d fid (%d:%d.%d.%d)"
-	ec 	CM_TRACE_DENTRYDELETE, "dentry_delete inode 0x%x d_name %s/%s"
-	ec	CM_TRACE_TRYFLUSHDCACHECHILDREN, "TryFlushDcacheChildren tvc 0x%x"
+	ec 	CM_TRACE_DENTRYDELETE, "d_delete inode 0x%x d_name %s/%s"
+	ec	CM_TRACE_DENTRYIPUT, "d_iput inode 0x%x d_name %s/%s"
+	ec	CM_TRACE_TRYFLUSHDCACHECHILDREN, "TryFlushDcacheChildren ip 0x%x"
 end