(type *)( (char *)__mptr - offsetof(type,member) );})
#endif
-#define UP_WRITE_I_ALLOC_SEM(i) up_write(&(i)->i_alloc_sem)
-#define DOWN_WRITE_I_ALLOC_SEM(i) down_write(&(i)->i_alloc_sem)
-#define LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) LASSERT(down_read_trylock(&(i)->i_alloc_sem) == 0)
-
-#define UP_READ_I_ALLOC_SEM(i) up_read(&(i)->i_alloc_sem)
-#define DOWN_READ_I_ALLOC_SEM(i) down_read(&(i)->i_alloc_sem)
-#define LASSERT_I_ALLOC_SEM_READ_LOCKED(i) LASSERT(down_write_trylock(&(i)->i_alloc_sem) == 0)
+#ifdef HAVE_INODE_DIO_WAIT
+/* inode_dio_wait(i) use as-is for write lock */
+# define inode_dio_write_done(i) do {} while (0) /* for write unlock */
+# define inode_dio_read(i) atomic_inc(&(i)->i_dio_count)
+/* inode_dio_done(i) use as-is for read unlock */
+#else
+# define inode_dio_wait(i) down_write(&(i)->i_alloc_sem)
+# define inode_dio_write_done(i) up_write(&(i)->i_alloc_sem)
+# define inode_dio_read(i) down_read(&(i)->i_alloc_sem)
+# define inode_dio_done(i) up_read(&(i)->i_alloc_sem)
+#endif
#include <linux/mpage.h> /* for generic_writepages */
# 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 */
#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; \
#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
# define lm_compare_owner fl_compare_owner
#endif
+/*
+ * After 3.1, kernel's nameidata.intent.open.flags is different
+ * with lustre's lookup_intent.it_flags, as lustre's it_flags'
+ * lower bits equal to FMODE_xxx while kernel doesn't transliterate
+ * lower bits of nameidata.intent.open.flags to FMODE_xxx.
+ * */
+#include <linux/version.h>
+static inline int ll_namei_to_lookup_intent_flag(int flag)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
+ flag = (flag & ~O_ACCMODE) | OPEN_FMODE(flag);
+#endif
+ return flag;
+}
+
+#ifdef HAVE_VOID_MAKE_REQUEST_FN
+# define ll_mrf_ret void
+# define LL_MRF_RETURN(rc)
+#else
+# define ll_mrf_ret int
+# define LL_MRF_RETURN(rc) RETURN(rc)
+#endif
+
+#include <linux/fs.h>
+#ifndef HAVE_PROTECT_I_NLINK
+static inline void set_nlink(struct inode *inode, unsigned int nlink)
+{
+ inode->i_nlink = nlink;
+}
+#endif
+
#endif /* _COMPAT25_H */