X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_compat25.h;h=6a9c0602c81d4531247cff30009c4e42afaeb58b;hp=d2f5e61b180b858e9bf049c0fc741ff403176fbf;hb=45176323c64a27fbbaa3ed837765537687f50cc6;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70 diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index d2f5e61..6a9c060 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -39,33 +39,12 @@ #ifdef __KERNEL__ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) -#error sorry, lustre requires at least linux kernel 2.6.9 or later -#endif - #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 - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) -struct ll_iattr { - struct iattr iattr; - unsigned int ia_attr_flags; -}; -#else -#define ll_iattr iattr -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */ - #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) @@ -121,47 +100,9 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, */ #define ATTR_BLOCKS (1 << 27) -#if HAVE_INODE_I_MUTEX -#define UNLOCK_INODE_MUTEX(inode) \ -do {cfs_mutex_unlock(&(inode)->i_mutex); } while(0) -#define LOCK_INODE_MUTEX(inode) \ -do {cfs_mutex_lock(&(inode)->i_mutex); } while(0) -#define LOCK_INODE_MUTEX_PARENT(inode) \ -do {cfs_mutex_lock_nested(&(inode)->i_mutex, I_MUTEX_PARENT); } while(0) -#define TRYLOCK_INODE_MUTEX(inode) cfs_mutex_trylock(&(inode)->i_mutex) -#else -#define UNLOCK_INODE_MUTEX(inode) do cfs_up(&(inode)->i_sem); } while(0) -#define LOCK_INODE_MUTEX(inode) do cfs_down(&(inode)->i_sem); } while(0) -#define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem)) -#define LOCK_INODE_MUTEX_PARENT(inode) LOCK_INODE_MUTEX(inode) -#endif /* HAVE_INODE_I_MUTEX */ - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -#define d_child d_u.d_child -#define d_rcu d_u.d_rcu -#endif - -#ifdef HAVE_DQUOTOFF_MUTEX -#define UNLOCK_DQONOFF_MUTEX(dqopt) cfs_mutex_unlock(&(dqopt)->dqonoff_mutex) -#define LOCK_DQONOFF_MUTEX(dqopt) cfs_mutex_lock(&(dqopt)->dqonoff_mutex) -#else -#define UNLOCK_DQONOFF_MUTEX(dqopt) cfs_up(&(dqopt)->dqonoff_sem) -#define LOCK_DQONOFF_MUTEX(dqopt) cfs_down(&(dqopt)->dqonoff_sem) -#endif /* HAVE_DQUOTOFF_MUTEX */ - #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 lock_dentry(___dentry) cfs_spin_lock(&(___dentry)->d_lock) -#define unlock_dentry(___dentry) cfs_spin_unlock(&(___dentry)->d_lock) - -#define ll_kernel_locked() kernel_locked() - /* * OBD need working random driver, thus all our * initialization routines must be called after device @@ -172,18 +113,11 @@ do {cfs_mutex_lock_nested(&(inode)->i_mutex, I_MUTEX_PARENT); } while(0) #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) @@ -191,12 +125,15 @@ do {cfs_mutex_lock_nested(&(inode)->i_mutex, I_MUTEX_PARENT); } while(0) #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) @@ -258,11 +195,6 @@ static inline int cfs_cleanup_group_info(void) #include -#if !defined(HAVE_D_REHASH_COND) && defined(HAVE___D_REHASH) -#define d_rehash_cond(dentry, lock) __d_rehash(dentry, lock) -extern void __d_rehash(struct dentry *dentry, int lock); -#endif - #define CheckWriteback(page, cmd) \ ((!PageWriteback(page) && (cmd & OBD_BRW_READ)) || \ (PageWriteback(page) && (cmd & OBD_BRW_WRITE))) @@ -307,11 +239,6 @@ static inline int mapping_has_pages(struct address_space *mapping) vfs_symlink(dir, dentry, path) #endif -#define ll_set_dflags(dentry, flags) do { \ - cfs_spin_lock(&dentry->d_lock); \ - dentry->d_flags |= flags; \ - cfs_spin_unlock(&dentry->d_lock); \ - } while(0) #endif #ifndef container_of @@ -330,40 +257,35 @@ static inline int mapping_has_pages(struct address_space *mapping) #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; + unsigned int count = 0; + int cpu; - for_each_possible_cpu(cpu) { - count += per_cpu_ptr(mnt->mnt_pcp, cpu)->mnt_count; - } + for_each_possible_cpu(cpu) { + count += per_cpu_ptr(real_mount(mnt)->mnt_pcp, cpu)->mnt_count; + } - return count; + return count; #else - return mnt->mnt_count; + return real_mount(mnt)->mnt_count; #endif } #else -# define mnt_get_count(mnt) cfs_atomic_read(&mnt->mnt_count) -#endif - -#ifdef HAVE_STATFS_DENTRY_PARAM -#define ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb)->s_root, (sfs)) -#else -#define ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb), (sfs)) -#endif - -#ifndef HAVE_SB_TIME_GRAN -#ifndef HAVE_S_TIME_GRAN -#error Need s_time_gran patch! -#endif -static inline u32 get_sb_time_gran(struct super_block *sb) -{ - return sb->s_time_gran; -} +# define mnt_get_count(mnt) cfs_atomic_read(&(real_mount(mnt)->mnt_count)) #endif #ifdef HAVE_RW_TREE_LOCK @@ -391,11 +313,7 @@ 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) -#endif #ifdef HAVE_FS_RENAME_DOES_D_MOVE #define LL_RENAME_DOES_D_MOVE FS_RENAME_DOES_D_MOVE @@ -429,8 +347,6 @@ static inline struct dentry *d_obtain_alias(struct inode *inode) #define ll_crypto_hash_init(desc) crypto_hash_init(desc) #define ll_crypto_hash_update(desc, sl, bytes) crypto_hash_update(desc, sl, bytes) #define ll_crypto_hash_final(desc, out) crypto_hash_final(desc, out) -#define ll_crypto_alloc_blkcipher(name, type, mask) \ - crypto_alloc_blkcipher(name ,type, mask) #define ll_crypto_blkcipher_setkey(tfm, key, keylen) \ crypto_blkcipher_setkey(tfm, key, keylen) #define ll_crypto_blkcipher_set_iv(tfm, src, len) \ @@ -446,6 +362,15 @@ static inline struct dentry *d_obtain_alias(struct inode *inode) #define ll_crypto_blkcipher_decrypt_iv(desc, dst, src, bytes) \ crypto_blkcipher_decrypt_iv(desc, dst, src, bytes) +static inline +struct ll_crypto_cipher *ll_crypto_alloc_blkcipher(const char *name, + u32 type, u32 mask) +{ + struct ll_crypto_cipher *rtn = crypto_alloc_blkcipher(name, type, mask); + + return (rtn == NULL ? ERR_PTR(-ENOMEM) : rtn); +} + static inline int ll_crypto_hmac(struct ll_crypto_hash *tfm, u8 *key, unsigned int *keylen, struct scatterlist *sg, @@ -515,25 +440,27 @@ static inline struct ll_crypto_cipher *ll_crypto_alloc_blkcipher(const char * algname, u32 type, u32 mask) { - char buf[CRYPTO_MAX_ALG_NAME + 1]; - const char *pan = algname; - u32 flag = 0; - - if (strncmp("cbc(", algname, 4) == 0) - flag |= CRYPTO_TFM_MODE_CBC; - else if (strncmp("ecb(", algname, 4) == 0) - flag |= CRYPTO_TFM_MODE_ECB; - if (flag) { - char *vp = strnchr(algname, CRYPTO_MAX_ALG_NAME, ')'); - if (vp) { - memcpy(buf, algname + 4, vp - algname - 4); - buf[vp - algname - 4] = '\0'; - pan = buf; - } else { - flag = 0; - } - } - return crypto_alloc_tfm(pan, flag); + struct ll_crypto_cipher *rtn; + char buf[CRYPTO_MAX_ALG_NAME + 1]; + const char *pan = algname; + u32 flag = 0; + + if (strncmp("cbc(", algname, 4) == 0) + flag |= CRYPTO_TFM_MODE_CBC; + else if (strncmp("ecb(", algname, 4) == 0) + flag |= CRYPTO_TFM_MODE_ECB; + if (flag) { + char *vp = strnchr(algname, CRYPTO_MAX_ALG_NAME, ')'); + if (vp) { + memcpy(buf, algname + 4, vp - algname - 4); + buf[vp - algname - 4] = '\0'; + pan = buf; + } else { + flag = 0; + } + } + rtn = crypto_alloc_tfm(pan, flag); + return (rtn == NULL ? ERR_PTR(-ENOMEM) : rtn); } static inline @@ -604,16 +531,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) @@ -660,52 +577,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 - -#ifdef HAVE_INODE_IPRIVATE -#define INODE_PRIVATE_DATA(inode) ((inode)->i_private) -#else -#define INODE_PRIVATE_DATA(inode) ((inode)->u.generic_ip) -#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 @@ -826,7 +715,13 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) #define ll_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_add(pv, pg) pagevec_add(pv, pg) +#define ll_pagevec_add(pv, pg) \ +({ \ + int __ret; \ + \ + page_cache_get(pg); \ + __ret = pagevec_add(pv, pg); \ +}) #define ll_pagevec_lru_add_file(pv) pagevec_lru_add_file(pv) #endif