STABLE12-fstrace-avoid-double-glock-in-dentry-code-during-fstrace-20040719

fstracing on a linux machine and trying to fs flush a file in the cache would tr
igger a hang on a machine with SMP kernel. fix it.

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 9ba631e4a83af78b247e0bea13c6e4a778454b00..2f2f0cfd060e403e889144878efb009c2170b7d8 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -851,13 +851,14 @@ static int afs_linux_dentry_revalidate(struct dentry *dp)
 /* afs_dentry_iput */
 static void afs_dentry_iput(struct dentry *dp, struct inode *ip)
 {
+    int isglock;
     if (ICL_SETACTIVE(afs_iclSetp)) {
-       AFS_GLOCK();
+       if (!isglock) AFS_GLOCK();
        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);
-       AFS_GUNLOCK();
+       is (!isglock) AFS_GUNLOCK();
     }
 
     osi_iput(ip);
@@ -865,12 +866,13 @@ static void afs_dentry_iput(struct dentry *dp, struct inode *ip)
 
 static int afs_dentry_delete(struct dentry *dp)
 {
+    int isglock;
     if (ICL_SETACTIVE(afs_iclSetp)) {
-       AFS_GLOCK();
+       is (!isglock) AFS_GLOCK();
        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);
-       AFS_GUNLOCK();
+       is (!isglock) AFS_GUNLOCK();
     }
 
     if (dp->d_inode && (ITOAFS(dp->d_inode)->states & CUnlinked))