#ifndef _LINUX_COMPAT25_H
#define _LINUX_COMPAT25_H
-#ifdef __KERNEL__
-
#include <linux/fs_struct.h>
#include <linux/namei.h>
#include <libcfs/linux/portals_compat25.h>
#include <linux/lustre_patchless_compat.h>
-/* Some old kernels (like 2.6.9) may not define such SEEK_XXX. So the
- * definition allows to compile lustre client on more OS platforms. */
-#ifndef SEEK_SET
- #define SEEK_SET 0
- #define SEEK_CUR 1
- #define SEEK_END 2
-#endif
-
#ifdef HAVE_FS_STRUCT_RWLOCK
# define LOCK_FS_STRUCT(fs) cfs_write_lock(&(fs)->lock)
# define UNLOCK_FS_STRUCT(fs) cfs_write_unlock(&(fs)->lock)
#define current_ngroups current_cred()->group_info->ngroups
#define current_groups current_cred()->group_info->small_block
-#ifndef page_private
-#define page_private(page) ((page)->private)
-#define set_page_private(page, v) ((page)->private = (v))
-#endif
-
-#define ll_kernel_locked() kernel_locked()
-
/*
* OBD need working random driver, thus all our
* initialization routines must be called after device
#define module_init(a) late_initcall(a)
#endif
-/* XXX our code should be using the 2.6 calls, not the other way around */
-#ifdef HAVE_TRYLOCK_PAGE
-#define TestSetPageLocked(page) (!trylock_page(page))
+#ifndef HAVE_TRYLOCK_PAGE
+#define trylock_page(page) (!TestSetPageLocked(page))
#endif
-#define Page_Uptodate(page) PageUptodate(page)
-#define ll_redirty_page(page) set_page_dirty(page)
-
-#define KDEVT_INIT(val) (val)
-
#define LTIME_S(time) (time.tv_sec)
-#define ll_path_lookup path_lookup
#ifdef HAVE_EXPORT_INODE_PERMISSION
#define ll_permission(inode,mask,nd) inode_permission(inode,mask)
#define ll_permission(inode,mask,nd) permission(inode,mask,nd)
#endif
-#ifdef HAVE_GENERIC_PERMISSION_4ARGS
-#define ll_generic_permission(inode, mask, flags, check_acl) \
- generic_permission(inode, mask, flags, check_acl)
+#ifdef HAVE_GENERIC_PERMISSION_2ARGS
+# define ll_generic_permission(inode, mask, flags, check_acl) \
+ generic_permission(inode, mask)
+#elif defined HAVE_GENERIC_PERMISSION_4ARGS
+# define ll_generic_permission(inode, mask, flags, check_acl) \
+ generic_permission(inode, mask, flags, check_acl)
#else
-#define ll_generic_permission(inode, mask, flags, check_acl) \
- generic_permission(inode, mask, check_acl)
+# define ll_generic_permission(inode, mask, flags, check_acl) \
+ generic_permission(inode, mask, check_acl)
#endif
-#define ll_pgcache_lock(mapping) cfs_spin_lock(&mapping->page_lock)
-#define ll_pgcache_unlock(mapping) cfs_spin_unlock(&mapping->page_lock)
-#define ll_call_writepage(inode, page) \
- (inode)->i_mapping->a_ops->writepage(page, NULL)
-#define ll_invalidate_inode_pages(inode) \
- invalidate_inode_pages((inode)->i_mapping)
-
-#define ll_vfs_create(a,b,c,d) vfs_create(a,b,c,d)
-#define ll_dev_t dev_t
-#define kdev_t dev_t
-#define to_kdev_t(dev) (dev)
-#define kdev_t_to_nr(dev) (dev)
-#define val_to_kdev(dev) (dev)
-
#ifdef HAVE_BLKDEV_PUT_2ARGS
#define ll_blkdev_put(a, b) blkdev_put(a, b)
#else
#define ll_dentry_open(a, b, c, d) dentry_open(a, b, c)
#endif
-#include <linux/writeback.h>
-
-static inline int cfs_cleanup_group_info(void)
-{
- struct group_info *ginfo;
-
- ginfo = groups_alloc(0);
- if (!ginfo)
- return -ENOMEM;
-
- set_current_groups(ginfo);
- put_group_info(ginfo);
-
- return 0;
-}
-
-#define __set_page_ll_data(page, llap) \
- do { \
- page_cache_get(page); \
- SetPagePrivate(page); \
- set_page_private(page, (unsigned long)llap); \
- } while (0)
-#define __clear_page_ll_data(page) \
- do { \
- ClearPagePrivate(page); \
- set_page_private(page, 0); \
- page_cache_release(page); \
- } while(0)
-
-#define kiobuf bio
-
-#include <linux/proc_fs.h>
-
-#define CheckWriteback(page, cmd) \
- ((!PageWriteback(page) && (cmd & OBD_BRW_READ)) || \
- (PageWriteback(page) && (cmd & OBD_BRW_WRITE)))
-
-#ifdef HAVE_PAGE_LIST
-static inline int mapping_has_pages(struct address_space *mapping)
-{
- int rc = 1;
-
- ll_pgcache_lock(mapping);
- if (cfs_list_empty(&mapping->dirty_pages) &&
- cfs_list_empty(&mapping->clean_pages) &&
- cfs_list_empty(&mapping->locked_pages)) {
- rc = 0;
- }
- ll_pgcache_unlock(mapping);
-
- return rc;
-}
-#else
-static inline int mapping_has_pages(struct address_space *mapping)
-{
- return mapping->nrpages > 0;
-}
-#endif
-
#ifdef HAVE_KIOBUF_KIO_BLOCKS
#define KIOBUF_GET_BLOCKS(k) ((k)->kio_blocks)
#else
(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_invalidate_bdev(a,b) invalidate_bdev((a))
#endif
-#ifdef HAVE_INODE_BLKSIZE
-#define ll_inode_blksize(a) (a)->i_blksize
-#else
-#define ll_inode_blksize(a) (1<<(a)->i_blkbits)
+#ifndef FS_HAS_FIEMAP
+#define FS_HAS_FIEMAP (0)
#endif
-#ifdef HAVE_FS_RENAME_DOES_D_MOVE
-#define LL_RENAME_DOES_D_MOVE FS_RENAME_DOES_D_MOVE
-#else
-#define LL_RENAME_DOES_D_MOVE FS_ODD_RENAME
+#ifndef HAVE_FS_RENAME_DOES_D_MOVE
+#define FS_RENAME_DOES_D_MOVE FS_ODD_RENAME
#endif
#ifndef HAVE_D_OBTAIN_ALIAS
#define ll_crypto_tfm_alg_max_keysize crypto_tfm_alg_max_keysize
#endif /* HAVE_ASYNC_BLOCK_CIPHER */
-#ifdef HAVE_FILE_REMOVE_SUID
-# define ll_remove_suid(file, mnt) file_remove_suid(file)
-#else
-# ifdef HAVE_SECURITY_PLUG
-# define ll_remove_suid(file,mnt) remove_suid(file->f_dentry,mnt)
-# else
-# define ll_remove_suid(file,mnt) remove_suid(file->f_dentry)
-# endif
-#endif
-
#ifdef HAVE_SECURITY_PLUG
#define ll_vfs_rmdir(dir,entry,mnt) vfs_rmdir(dir,entry,mnt)
#define ll_vfs_mkdir(inode,dir,mnt,mode) vfs_mkdir(inode,dir,mnt,mode)
#define cfs_path_put(nd) path_release(nd)
#endif
-#ifndef abs
-static inline int abs(int x)
-{
- return (x < 0) ? -x : x;
-}
-#endif
-
-#ifndef labs
-static inline long labs(long x)
-{
- return (x < 0) ? -x : x;
-}
-#endif /* HAVE_REGISTER_SHRINKER */
-
#ifndef HAVE_SIMPLE_SETATTR
#define simple_setattr(dentry, ops) inode_setattr((dentry)->d_inode, ops)
#endif
#ifndef SLAB_DESTROY_BY_RCU
-#define CFS_SLAB_DESTROY_BY_RCU 0
-#else
-#define CFS_SLAB_DESTROY_BY_RCU SLAB_DESTROY_BY_RCU
+#define SLAB_DESTROY_BY_RCU 0
#endif
-#ifdef HAVE_SB_HAS_QUOTA_ACTIVE
-#define ll_sb_has_quota_active(sb, type) sb_has_quota_active(sb, type)
-#else
-#define ll_sb_has_quota_active(sb, type) sb_has_quota_enabled(sb, type)
+#ifndef HAVE_SB_HAS_QUOTA_ACTIVE
+#define sb_has_quota_active(sb, type) sb_has_quota_enabled(sb, type)
#endif
-#ifdef HAVE_SB_ANY_QUOTA_LOADED
-#define ll_sb_any_quota_active(sb) sb_any_quota_loaded(sb)
-#elif defined(HAVE_SB_ANY_QUOTA_ACTIVE)
-#define ll_sb_any_quota_active(sb) sb_any_quota_active(sb)
-#else
-#define ll_sb_any_quota_active(sb) sb_any_quota_enabled(sb)
+#ifndef HAVE_SB_ANY_QUOTA_LOADED
+# ifdef HAVE_SB_ANY_QUOTA_ACTIVE
+# define sb_any_quota_loaded(sb) sb_any_quota_active(sb)
+# else
+# define sb_any_quota_loaded(sb) sb_any_quota_enabled(sb)
+# endif
#endif
static inline int
}
#endif
-#endif /* __KERNEL__ */
+#ifndef HAVE_LM_XXX_LOCK_MANAGER_OPS
+# 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 */