X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_compat25.h;h=2921bfb8e7b796b272d0a46c69d4897a0e6553f0;hp=f872a1e607133a628bccfb89dd9f04a01c32c464;hb=472fe13982952c9ccad969a996c054f9cf643847;hpb=81fa7775360302c7dfeb08ab708969b6a9287bd0;ds=sidebyside

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index f872a1e..2921bfb 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -587,18 +587,9 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 # define ll_vfs_dq_off(sb, remount) vfs_dq_off(sb, remount)
 #endif
 
-#ifdef HAVE_BDI_INIT
-#define ll_bdi_init(bdi)    bdi_init(bdi)
-#define ll_bdi_destroy(bdi) bdi_destroy(bdi)
-#else
-#define ll_bdi_init(bdi)    0
-#define ll_bdi_destroy(bdi) do { } while(0)
-#endif
-
-#ifdef HAVE_NEW_BACKING_DEV_INFO
-# define ll_bdi_wb_cnt(bdi) ((bdi).wb_cnt)
-#else
-# define ll_bdi_wb_cnt(bdi) 1
+#ifndef HAVE_BDI_INIT
+#define bdi_init(bdi)    0
+#define bdi_destroy(bdi) do { } while (0)
 #endif
 
 #ifdef HAVE_BLK_QUEUE_MAX_SECTORS /* removed in rhel6 */
@@ -635,15 +626,13 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #endif
 
 #ifdef HAVE_ADD_TO_PAGE_CACHE_LRU
-#define ll_add_to_page_cache_lru(pg, mapping, off, gfp) \
-        add_to_page_cache_lru(pg, mapping, off, gfp)
 #define ll_pagevec_init(pv, cold)       do {} while (0)
 #define ll_pagevec_add(pv, pg)          (0)
 #define ll_pagevec_lru_add_file(pv)     do {} while (0)
 #else
-#define ll_add_to_page_cache_lru(pg, mapping, off, gfp) \
+#define add_to_page_cache_lru(pg, mapping, off, gfp) \
         add_to_page_cache(pg, mapping, off, gfp)
-#define ll_pagevec_init(pv, cold)       pagevec_init(&lru_pvec, cold);
+#define ll_pagevec_init(pv, cold)       pagevec_init(pv, cold);
 #define ll_pagevec_add(pv, pg)					\
 ({								\
 	int __ret;						\
@@ -659,13 +648,6 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define HAVE_NODE_TO_CPUMASK
 #endif
 
-#ifndef QUOTA_OK
-# define QUOTA_OK 0
-#endif
-#ifndef NO_QUOTA
-# define NO_QUOTA (-EDQUOT)
-#endif
-
 #if !defined(_ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_) && !defined(ext2_set_bit)
 # define ext2_set_bit             __test_and_set_bit_le
 # define ext2_clear_bit           __test_and_clear_bit_le