AC_CHECK_LINUX_FUNC([d_alloc_anon],
[#include <linux/fs.h>],
[d_alloc_anon(NULL);])
+ AC_CHECK_LINUX_FUNC([d_count],
+ [#include <linux/dcache.h>],
+ [d_count(NULL);])
AC_CHECK_LINUX_FUNC([d_make_root],
[#include <linux/fs.h>],
[d_make_root(NULL);])
#endif
}
+static inline int
+afs_dentry_count(struct dentry *dp)
+{
+#if defined(HAVE_LINUX_D_COUNT)
+ return d_count(dp);
+#elif defined(D_COUNT_INT)
+ return dp->d_count;
+#else
+ return atomic_read(&dp->d_count);
+#endif
+}
+
+static inline void
+afs_maybe_shrink_dcache(struct dentry *dp)
+{
+#if defined(HAVE_LINUX_D_COUNT) || defined(D_COUNT_INT)
+ spin_lock(&dp->d_lock);
+ if (afs_dentry_count(dp) > 1) {
+ spin_unlock(&dp->d_lock);
+ shrink_dcache_parent(dp);
+ } else
+ spin_unlock(&dp->d_lock);
+#else
+ if (afs_dentry_count(dp) > 1)
+ shrink_dcache_parent(dp);
+#endif
+}
+
#endif /* AFS_LINUX_OSI_COMPAT_H */
rehash = newdp;
}
-#if defined(D_COUNT_INT)
- spin_lock(&olddp->d_lock);
- if (olddp->d_count > 1) {
- spin_unlock(&olddp->d_lock);
- shrink_dcache_parent(olddp);
- } else
- spin_unlock(&olddp->d_lock);
-#else
- if (atomic_read(&olddp->d_count) > 1)
- shrink_dcache_parent(olddp);
-#endif
+ afs_maybe_shrink_dcache(olddp);
AFS_GLOCK();
code = afs_rename(VTOAFS(oldip), (char *)oldname, VTOAFS(newip), (char *)newname, credp);