LU-709 build: clean up quota_read, follow_link and RCU

[fs/lustre-release.git] / lustre / include / linux / lustre_patchless_compat.h

diff --git a/lustre/include/linux/lustre_patchless_compat.h b/lustre/include/linux/lustre_patchless_compat.h
index 06f1aa3..d79d1c8 100644 (file)
--- a/lustre/include/linux/lustre_patchless_compat.h
+++ b/lustre/include/linux/lustre_patchless_compat.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,7 +37,6 @@
 #ifndef LUSTRE_PATCHLESS_COMPAT_H
 #define LUSTRE_PATCHLESS_COMPAT_H
 
-#include <linux/lustre_version.h>
 #include <linux/fs.h>
 
 #ifndef HAVE_TRUNCATE_COMPLETE_PAGE
@@ -106,21 +105,12 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 }
 #endif /* !HAVE_TRUNCATE_COMPLETE_PAGE */
 
-#if !defined(HAVE_D_REHASH_COND) && !defined(HAVE___D_REHASH)
-/* megahack */
-static inline void d_rehash_cond(struct dentry * entry, int lock)
-{
-       if (!lock)
-               spin_unlock(&dcache_lock);
-
-       d_rehash(entry);
-
-       if (!lock)
-               spin_lock(&dcache_lock);
-}
-
-#define __d_rehash(dentry, lock) d_rehash_cond(dentry, lock)
-#endif /* !HAVE_D_REHASH_COND && !HAVE___D_REHASH*/
+#ifdef HAVE_DCACHE_LOCK
+#  define dget_dlock(d)                 dget_locked(d)
+#  define d_refcount(d)                 atomic_read(&(d)->d_count)
+#else
+#  define d_refcount(d)                 ((d)->d_count)
+#endif /* HAVE_DCACHE_LOCK */
 
 #ifdef ATTR_OPEN
 # define ATTR_FROM_OPEN ATTR_OPEN