LU-823 compat: Don't use cfs_ functions on kernel structures

[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 d79d1c8..061c5da 100644 (file)
--- a/lustre/include/linux/lustre_patchless_compat.h
+++ b/lustre/include/linux/lustre_patchless_compat.h
@@ -50,9 +50,6 @@
 
 #ifndef HAVE_DELETE_FROM_PAGE_CACHE /* 2.6.39 */
 #ifndef HAVE_REMOVE_FROM_PAGE_CACHE /* 2.6.35 - 2.6.38 */
-#ifdef HAVE_NR_PAGECACHE /* 2.6.18 */
-#define __dec_zone_page_state(page, flag) atomic_add(-1, &nr_pagecache);
-#endif /* HAVE_NR_PAGECACHE */
 
 /* XXX copy & paste from 2.6.15 kernel */
 static inline void ll_remove_from_page_cache(struct page *page)
@@ -64,7 +61,7 @@ static inline void ll_remove_from_page_cache(struct page *page)
 #ifdef HAVE_RW_TREE_LOCK
         write_lock_irq(&mapping->tree_lock);
 #else
-       cfs_spin_lock_irq(&mapping->tree_lock);
+       spin_lock_irq(&mapping->tree_lock);
 #endif
         radix_tree_delete(&mapping->page_tree, page->index);
         page->mapping = NULL;
@@ -74,7 +71,7 @@ static inline void ll_remove_from_page_cache(struct page *page)
 #ifdef HAVE_RW_TREE_LOCK
         write_unlock_irq(&mapping->tree_lock);
 #else
-       cfs_spin_unlock_irq(&mapping->tree_lock);
+       spin_unlock_irq(&mapping->tree_lock);
 #endif
 }
 #else /* HAVE_REMOVE_FROM_PAGE_CACHE */