From b1dd3e496d54e0e246c27d2ddc504beaf8fddc54 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Fri, 4 Nov 2011 15:59:11 -0700 Subject: [PATCH 1/1] LU-823 compat: Don't use cfs_ functions on kernel structures It is not really correct to use the generic "cfs_" prefixed locking functions on the Linux kernel's data structures. Revert back to using the Linux locking function. Change-Id: I64619c4b4f4963634b3d1e43c1b1519598e65e8d Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/4176 Reviewed-by: Andreas Dilger Tested-by: Hudson Tested-by: Maloo Reviewed-by: Keith Mannthey Reviewed-by: Peng Tao --- lustre/include/linux/lustre_patchless_compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/include/linux/lustre_patchless_compat.h b/lustre/include/linux/lustre_patchless_compat.h index 9af47ef..061c5da 100644 --- a/lustre/include/linux/lustre_patchless_compat.h +++ b/lustre/include/linux/lustre_patchless_compat.h @@ -61,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; @@ -71,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 */ -- 1.8.3.1