LINUX: consolidate duplicate code in osi_TryEvictDentries
[openafs.git] / src / afs / LINUX / osi_vcache.c
index 8a0c578..1a5012c 100644 (file)
 #include <afsconfig.h>
 #include "afs/param.h"
 
-#include "afs/sysincludes.h"    /*Standard vendor system headers */
-#include "afsincludes.h"        /*AFS-based standard headers */
+#include "afs/sysincludes.h"   /*Standard vendor system headers */
+#include "afsincludes.h"       /*AFS-based standard headers */
 
 #include "osi_compat.h"
 
-int
-osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep) {
-    int code;
-
+static void
+TryEvictDentries(struct vcache *avc)
+{
     struct dentry *dentry;
     struct inode *inode = AFSTOV(avc);
 #if defined(D_ALIAS_IS_HLIST) && !defined(HLIST_ITERATOR_NO_NODE)
     struct hlist_node *p;
 #endif
 
-    /* First, see if we can evict the inode from the dcache */
-    if (defersleep && avc != afs_globalVp && VREFCOUNT(avc) > 1 && avc->opens == 0) {
-       *slept = 1;
-       AFS_FAST_HOLD(avc);
-       ReleaseWriteLock(&afs_xvcache);
-        AFS_GUNLOCK();
-
-#if defined(HAVE_DCACHE_LOCK)
-        spin_lock(&dcache_lock);
-
-restart:
-       list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
-           if (d_unhashed(dentry))
-               continue;
-           dget_locked(dentry);
-
-           spin_unlock(&dcache_lock);
-           if (d_invalidate(dentry) == -EBUSY) {
-               dput(dentry);
-               /* perhaps lock and try to continue? (use cur as head?) */
-               goto inuse;
-           }
-           dput(dentry);
-           spin_lock(&dcache_lock);
-           goto restart;
-       }
-       spin_unlock(&dcache_lock);
-#else /* HAVE_DCACHE_LOCK */
-       spin_lock(&inode->i_lock);
+    afs_d_alias_lock(inode);
 
 restart:
 #if defined(D_ALIAS_IS_HLIST)
 # if defined(HLIST_ITERATOR_NO_NODE)
-       hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
+    hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
 # else
-       hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) {
+    hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) {
 # endif
 #else
-       list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
+    list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
 #endif
-           spin_lock(&dentry->d_lock);
-           if (d_unhashed(dentry)) {
-               spin_unlock(&dentry->d_lock);
-               continue;
-           }
+       spin_lock(&dentry->d_lock);
+       if (d_unhashed(dentry)) {
            spin_unlock(&dentry->d_lock);
-           dget(dentry);
-
-           spin_unlock(&inode->i_lock);
-           if (afs_d_invalidate(dentry) == -EBUSY) {
-               dput(dentry);
-               /* perhaps lock and try to continue? (use cur as head?) */
-               goto inuse;
-           }
+           continue;
+       }
+       spin_unlock(&dentry->d_lock);
+       afs_linux_dget(dentry);
+
+       afs_d_alias_unlock(inode);
+       if (afs_d_invalidate(dentry) == -EBUSY) {
            dput(dentry);
-           spin_lock(&inode->i_lock);
-           goto restart;
+           /* perhaps lock and try to continue? (use cur as head?) */
+           goto inuse;
        }
-       spin_unlock(&inode->i_lock);
-#endif /* HAVE_DCACHE_LOCK */
+       dput(dentry);
+       afs_d_alias_lock(inode);
+       goto restart;
+    }
+    afs_d_alias_unlock(inode);
+
 inuse:
+    return;
+}
+
+
+int
+osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep)
+{
+    int code;
+
+    /* First, see if we can evict the inode from the dcache */
+    if (defersleep && avc != afs_globalVp && VREFCOUNT(avc) > 1
+       && avc->opens == 0) {
+       *slept = 1;
+       AFS_FAST_HOLD(avc);
+       ReleaseWriteLock(&afs_xvcache);
+       AFS_GUNLOCK();
+
+       TryEvictDentries(avc);
+
        AFS_GLOCK();
        ObtainWriteLock(&afs_xvcache, 733);
        AFS_FAST_RELE(avc);
     }
 
     /* See if we can evict it from the VLRUQ */
-    if (VREFCOUNT_GT(avc,0) && !VREFCOUNT_GT(avc,1) && avc->opens == 0
+    if (VREFCOUNT_GT(avc, 0) && !VREFCOUNT_GT(avc, 1) && avc->opens == 0
        && (avc->f.states & CUnlinkedDel) == 0) {
        int didsleep = *slept;
 
@@ -134,17 +124,22 @@ osi_NewVnode(void)
 }
 
 void
-osi_PrePopulateVCache(struct vcache *avc) {
+osi_PrePopulateVCache(struct vcache *avc)
+{
     avc->uncred = 0;
     memset(&(avc->f), 0, sizeof(struct fvcache));
     avc->cred = NULL;
 }
 
 void
-osi_AttachVnode(struct vcache *avc, int seq) { /* Nada */ }
+osi_AttachVnode(struct vcache *avc, int seq)
+{
+    /* Nada */
+}
 
 void
-osi_PostPopulateVCache(struct vcache *avc) {
+osi_PostPopulateVCache(struct vcache *avc)
+{
     vSetType(avc, VREG);
 }
 
@@ -181,11 +176,8 @@ osi_ResetRootVCache(afs_uint32 volid)
 
     dp = d_find_alias(root);
 
-#if defined(HAVE_DCACHE_LOCK)
-    spin_lock(&dcache_lock);
-#else
-    spin_lock(&AFSTOV(vcp)->i_lock);
-#endif
+    afs_d_alias_lock(AFSTOV(vcp));
+
     spin_lock(&dp->d_lock);
 #if defined(D_ALIAS_IS_HLIST)
     hlist_del_init(&dp->d_alias);
@@ -196,11 +188,9 @@ osi_ResetRootVCache(afs_uint32 volid)
 #endif
     dp->d_inode = AFSTOV(vcp);
     spin_unlock(&dp->d_lock);
-#if defined(HAVE_DCACHE_LOCK)
-    spin_unlock(&dcache_lock);
-#else
-    spin_unlock(&AFSTOV(vcp)->i_lock);
-#endif
+
+    afs_d_alias_unlock(AFSTOV(vcp));
+
     dput(dp);
 
     AFS_RELE(root);