X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_compat25.h;h=e0a29ff5a7531fa9a43a5185d5c34eaa11a76ebc;hp=b717b90294b6559f9d0d421f3687c3abbde03b8e;hb=1e149bef8d832aade6c04b65b8308b71c6d523ed;hpb=725b8599bbf4c98173cc049d8a73920a31287d5c diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index b717b90..e0a29ff 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -27,7 +27,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,28 +37,18 @@ #ifndef _LINUX_COMPAT25_H #define _LINUX_COMPAT25_H -#ifdef __KERNEL__ - #include #include #include #include -/* 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 LOCK_FS_STRUCT(fs) write_lock(&(fs)->lock) +# define UNLOCK_FS_STRUCT(fs) write_unlock(&(fs)->lock) #else -# define LOCK_FS_STRUCT(fs) cfs_spin_lock(&(fs)->lock) -# define UNLOCK_FS_STRUCT(fs) cfs_spin_unlock(&(fs)->lock) +# define LOCK_FS_STRUCT(fs) spin_lock(&(fs)->lock) +# define UNLOCK_FS_STRUCT(fs) spin_unlock(&(fs)->lock) #endif #ifdef HAVE_FS_STRUCT_USE_PATH @@ -111,13 +101,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, #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 @@ -128,18 +111,11 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, #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) @@ -147,105 +123,46 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, #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_blkdev_put(a, b) blkdev_put(a) #endif -#ifdef HAVE_DENTRY_OPEN_4ARGS -#define ll_dentry_open(a, b, c, d) dentry_open(a, b, c, d) -#else -#define ll_dentry_open(a, b, c, d) dentry_open(a, b, c) -#endif - -#include - -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 - -#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; -} +#ifdef HAVE_DENTRY_OPEN_USE_PATH +#define ll_dentry_open(a,b,c) dentry_open(a,b,c) #else -static inline int mapping_has_pages(struct address_space *mapping) +/* + * dentry_open handles its own reference counting since Linux v3.6 + * (commit 765927b2). Callers should free their own references. + * + * Prior versions expected the caller to increment the references. + * The references are retained on success and freed on error. + */ +static inline struct file *ll_dentry_open(struct path *path, int flags, + const struct cred *cred) { - return mapping->nrpages > 0; + mntget(path->mnt); + dget(path->dentry); +# ifdef HAVE_DENTRY_OPEN_4ARGS + return dentry_open(path->dentry, path->mnt, flags, cred); +# else + return dentry_open(path->dentry, path->mnt, flags); +# endif } #endif -#ifdef HAVE_KIOBUF_KIO_BLOCKS -#define KIOBUF_GET_BLOCKS(k) ((k)->kio_blocks) -#else -#define KIOBUF_GET_BLOCKS(k) ((k)->blocks) -#endif - #ifdef HAVE_SECURITY_PLUG #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ vfs_symlink(dir, dentry, mnt, path, mode) @@ -260,65 +177,32 @@ static inline int mapping_has_pages(struct address_space *mapping) #endif -#ifndef container_of -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (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) - -#include /* for generic_writepages */ - -#ifdef HAVE_HIDE_VFSMOUNT_GUTS -# include <../fs/mount.h> -#else -# define real_mount(mnt) (mnt) -#endif - -static inline const char *mnt_get_devname(struct vfsmount *mnt) -{ - return real_mount(mnt)->mnt_devname; -} - -#ifndef HAVE_ATOMIC_MNT_COUNT -static inline unsigned int mnt_get_count(struct vfsmount *mnt) -{ -#ifdef CONFIG_SMP - unsigned int count = 0; - int cpu; - - for_each_possible_cpu(cpu) { - count += per_cpu_ptr(real_mount(mnt)->mnt_pcp, cpu)->mnt_count; - } - - return count; +#if !defined(HAVE_FILE_LLSEEK_SIZE) || defined(HAVE_FILE_LLSEEK_SIZE_5ARGS) +#define ll_generic_file_llseek_size(file, offset, origin, maxbytes, eof) \ + generic_file_llseek_size(file, offset, origin, maxbytes, eof); #else - return real_mount(mnt)->mnt_count; -#endif -} -#else -# define mnt_get_count(mnt) cfs_atomic_read(&(real_mount(mnt)->mnt_count)) +#define ll_generic_file_llseek_size(file, offset, origin, maxbytes, eof) \ + generic_file_llseek_size(file, offset, origin, maxbytes); #endif -#ifdef HAVE_STATFS_DENTRY_PARAM -#define ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb)->s_root, (sfs)) +#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 ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb), (sfs)) +# 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 #ifdef HAVE_RW_TREE_LOCK -#define TREE_READ_LOCK_IRQ(mapping) read_lock_irq(&(mapping)->tree_lock) -#define TREE_READ_UNLOCK_IRQ(mapping) read_unlock_irq(&(mapping)->tree_lock) +#define TREE_READ_LOCK_IRQ(mapping) read_lock_irq(&(mapping)->tree_lock) +#define TREE_READ_UNLOCK_IRQ(mapping) read_unlock_irq(&(mapping)->tree_lock) #else -#define TREE_READ_LOCK_IRQ(mapping) cfs_spin_lock_irq(&(mapping)->tree_lock) -#define TREE_READ_UNLOCK_IRQ(mapping) cfs_spin_unlock_irq(&(mapping)->tree_lock) +#define TREE_READ_LOCK_IRQ(mapping) spin_lock_irq(&(mapping)->tree_lock) +#define TREE_READ_UNLOCK_IRQ(mapping) spin_unlock_irq(&(mapping)->tree_lock) #endif #ifdef HAVE_UNREGISTER_BLKDEV_RETURN_INT @@ -338,16 +222,12 @@ int ll_unregister_blkdev(unsigned int dev, const char *name) #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 @@ -560,16 +440,6 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #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) @@ -616,46 +486,24 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #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 */ - -#ifdef HAVE_INVALIDATE_INODE_PAGES -#define invalidate_mapping_pages(mapping,s,e) invalidate_inode_pages(mapping) -#endif - #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 @@ -707,6 +555,7 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) #define blk_queue_logical_block_size(q, sz) blk_queue_hardsect_size(q, sz) #endif +#ifndef HAVE_DQUOT_SUSPEND #ifndef HAVE_VFS_DQ_OFF # define ll_vfs_dq_init DQUOT_INIT # define ll_vfs_dq_drop DQUOT_DROP @@ -718,19 +567,16 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) # define ll_vfs_dq_transfer vfs_dq_transfer # 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) +# define ll_vfs_dq_init dquot_initialize +# define ll_vfs_dq_drop dquot_drop +# define ll_vfs_dq_transfer dquot_transfer +# define ll_vfs_dq_off(sb, remount) dquot_suspend(sb, -1) #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 */ @@ -757,6 +603,34 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) #define queue_max_hw_segments(rq) queue_max_segments(rq) #endif +#ifdef HAVE_KMAP_ATOMIC_HAS_1ARG +#define ll_kmap_atomic(a, b) kmap_atomic(a) +#define ll_kunmap_atomic(a, b) kunmap_atomic(a) +#else +#define ll_kmap_atomic(a, b) kmap_atomic(a, b) +#define ll_kunmap_atomic(a, b) kunmap_atomic(a, b) +#endif + +#ifndef HAVE_CLEAR_INODE +#define clear_inode(i) end_writeback(i) +#endif + +#ifdef HAVE_DENTRY_D_ALIAS_HLIST +#define ll_d_hlist_node hlist_node +#define ll_d_hlist_empty(list) hlist_empty(list) +#define ll_d_hlist_entry(ptr, type, name) hlist_entry(ptr.first, type, name) +#define ll_d_hlist_for_each(tmp, i_dentry) hlist_for_each(tmp, i_dentry) +#define ll_d_hlist_for_each_entry(dentry, p, i_dentry, alias) \ + hlist_for_each_entry(dentry, p, i_dentry, alias) +#else +#define ll_d_hlist_node list_head +#define ll_d_hlist_empty(list) list_empty(list) +#define ll_d_hlist_entry(ptr, type, name) list_entry(ptr.next, type, name) +#define ll_d_hlist_for_each(tmp, i_dentry) list_for_each(tmp, i_dentry) +#define ll_d_hlist_for_each_entry(dentry, p, i_dentry, alias) \ + p = NULL; list_for_each_entry(dentry, i_dentry, alias) +#endif + #ifndef HAVE_BI_HW_SEGMENTS #define bio_hw_segments(q, bio) 0 @@ -767,15 +641,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; \ @@ -786,9 +658,12 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) #define ll_pagevec_lru_add_file(pv) pagevec_lru_add_file(pv) #endif -#if !defined(HAVE_NODE_TO_CPUMASK) && defined(HAVE_CPUMASK_OF_NODE) -#define node_to_cpumask(i) (*(cpumask_of_node(i))) -#define HAVE_NODE_TO_CPUMASK +#if !defined(HAVE_CPUMASK_OF_NODE) && defined(HAVE_NODE_TO_CPUMASK) +# ifdef HAVE_OFED_CPUMASK_OF_NODE +# undef cpumask_of_node +# define HAVE_CPUMASK_OF_NODE +# endif +#define cpumask_of_node(i) (&node_to_cpumask(i)) #endif #ifndef QUOTA_OK @@ -798,6 +673,17 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) # define NO_QUOTA (-EDQUOT) #endif +#ifndef SEEK_DATA +#define SEEK_DATA 3 /* seek to the next data */ +#endif +#ifndef SEEK_HOLE +#define SEEK_HOLE 4 /* seek to the next hole */ +#endif + +#ifndef FMODE_UNSIGNED_OFFSET +#define FMODE_UNSIGNED_OFFSET ((__force fmode_t)0x2000) +#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 @@ -819,5 +705,58 @@ static inline bool selinux_is_enabled(void) } #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 +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 +#ifndef HAVE_PROTECT_I_NLINK +static inline void set_nlink(struct inode *inode, unsigned int nlink) +{ + inode->i_nlink = nlink; +} +#endif + +#ifdef HAVE_INODEOPS_USE_UMODE_T +# define ll_umode_t umode_t +#else +# define ll_umode_t int +#endif + +#include +#ifndef HAVE_D_MAKE_ROOT +static inline struct dentry *d_make_root(struct inode *root) +{ + struct dentry *res = d_alloc_root(root); + + if (res == NULL && root) + iput(root); + + return res; +} +#endif + #endif /* _COMPAT25_H */