From 49802c76b1a4cc1fb67e704e449325899ae42f0e Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Fri, 19 Aug 2005 16:32:24 +0000 Subject: [PATCH] rmdir-dont-hold-kernel-lock-20050819 potentially fix one of the deadlocks people have been seeing --- src/afs/LINUX/osi_vnodeops.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index fc5e8fa..a9df3ab 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -1098,9 +1098,8 @@ afs_linux_rmdir(struct inode *dip, struct dentry *dp) cred_t *credp = crref(); const char *name = dp->d_name.name; -#if defined(AFS_LINUX26_ENV) - lock_kernel(); -#endif + /* locking kernel conflicts with glock? */ + AFS_GLOCK(); code = afs_rmdir(VTOAFS(dip), name, credp); AFS_GUNLOCK(); @@ -1117,9 +1116,6 @@ afs_linux_rmdir(struct inode *dip, struct dentry *dp) d_drop(dp); } -#if defined(AFS_LINUX26_ENV) - unlock_kernel(); -#endif crfree(credp); return -code; } -- 1.9.4