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=470b2b7db03cfdcfd0a7189e7ffea2966ddcfc34;hb=472fe13982952c9ccad969a996c054f9cf643847;hpb=440d5b2c1e96c02fed5b839f5cd354032482cd3f diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 470b2b7..2921bfb 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. - */ -/* - * Copyright (c) 2011 Whamcloud, Inc. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,35 +37,12 @@ #ifndef _LINUX_COMPAT25_H #define _LINUX_COMPAT25_H -#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) @@ -124,59 +98,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 */ - -#ifdef HAVE_SEQ_LOCK -#define LL_SEQ_LOCK(seq) cfs_mutex_lock(&(seq)->lock) -#define LL_SEQ_UNLOCK(seq) cfs_mutex_unlock(&(seq)->lock) -#else -#define LL_SEQ_LOCK(seq) cfs_down(&(seq)->sem) -#define LL_SEQ_UNLOCK(seq) cfs_up(&(seq)->sem) -#endif - -#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 - -#ifndef HAVE_GFP_T -#define gfp_t int -#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 @@ -187,18 +111,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) @@ -206,28 +123,17 @@ 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) -#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 @@ -240,78 +146,6 @@ do {cfs_mutex_lock_nested(&(inode)->i_mutex, I_MUTEX_PARENT); } while(0) #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 - -#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 - -#ifdef HAVE_CAN_SLEEP_ARG -#define ll_flock_lock_file_wait(file, lock, can_sleep) \ - flock_lock_file_wait(file, lock, can_sleep) -#else -#define ll_flock_lock_file_wait(file, lock, can_sleep) \ - flock_lock_file_wait(file, lock) -#endif - -#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 @@ -330,11 +164,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 @@ -343,107 +172,49 @@ static inline int mapping_has_pages(struct address_space *mapping) (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) - -#ifndef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP -#define grab_cache_page_nowait_gfp(x, y, z) grab_cache_page_nowait((x), (y)) +#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 /* for generic_writepages */ -#ifndef HAVE_FILEMAP_FDATAWRITE_RANGE -#include /* for mapping->backing_dev_info */ -static inline int filemap_fdatawrite_range(struct address_space *mapping, - loff_t start, loff_t end) -{ - int rc; - struct writeback_control wbc = { - .sync_mode = WB_SYNC_ALL, - .nr_to_write = (end - start + PAGE_SIZE - 1) >> PAGE_SHIFT, - }; - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) - wbc.range_start = start; - wbc.range_end = end; -#else - wbc.start = start; - wbc.end = end; -#endif -#ifdef HAVE_MAPPING_CAP_WRITEBACK_DIRTY - if (!mapping_cap_writeback_dirty(mapping)) - rc = 0; +#ifdef HAVE_HIDE_VFSMOUNT_GUTS +# include <../fs/mount.h> #else - if (mapping->backing_dev_info->memory_backed) - rc = 0; +# define real_mount(mnt) (mnt) #endif - /* do_writepages() */ - else if (mapping->a_ops->writepages) - rc = mapping->a_ops->writepages(mapping, &wbc); - else - rc = generic_writepages(mapping, &wbc); - return rc; -} -#else -int filemap_fdatawrite_range(struct address_space *mapping, - loff_t start, loff_t end); -#endif /* HAVE_FILEMAP_FDATAWRITE_RANGE */ -#ifdef HAVE_VFS_KERN_MOUNT -static inline struct vfsmount * -ll_kern_mount(const char *fstype, int flags, const char *name, void *data) +static inline const char *mnt_get_devname(struct vfsmount *mnt) { - struct file_system_type *type = get_fs_type(fstype); - struct vfsmount *mnt; - if (!type) - return ERR_PTR(-ENODEV); - mnt = vfs_kern_mount(type, flags, name, data); - cfs_module_put(type->owner); - return mnt; + return real_mount(mnt)->mnt_devname; } -#else -#define ll_kern_mount(fstype, flags, name, data) do_kern_mount((fstype), (flags), (name), (data)) -#endif #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 @@ -471,16 +242,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 @@ -509,8 +276,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) \ @@ -526,6 +291,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, @@ -595,25 +369,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 @@ -684,16 +460,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) @@ -740,52 +506,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 @@ -849,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 */ @@ -897,16 +626,20 @@ 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_add(pv, pg) pagevec_add(pv, pg) +#define ll_pagevec_init(pv, cold) pagevec_init(pv, cold); +#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 @@ -915,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 @@ -930,5 +656,52 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) # define ext2_find_next_zero_bit find_next_zero_bit_le #endif -#endif /* __KERNEL__ */ +#ifdef ATTR_TIMES_SET +# define TIMES_SET_FLAGS (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET) +#else +# define TIMES_SET_FLAGS (ATTR_MTIME_SET | ATTR_ATIME_SET) +#endif + +#ifndef HAVE_SELINUX_IS_ENABLED +static inline bool selinux_is_enabled(void) +{ + return 0; +} +#endif + +#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 + #endif /* _COMPAT25_H */