X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_compat25.h;h=6b8d1551f4f8e3048dd557a8d42025d9afad99de;hb=539d4218b8c6d025bb2ebffec313a38b53e08cd1;hp=bb6ced3caa97468f8d169c839bfea4a0771470a0;hpb=a96897ae3ec1935b958f10ee8848d8f1dcc81a3e;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index bb6ced3..6b8d155 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. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -39,45 +39,60 @@ #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 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) -struct ll_iattr { - struct iattr iattr; - unsigned int ia_attr_flags; -}; +#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) +#else +# define LOCK_FS_STRUCT(fs) cfs_spin_lock(&(fs)->lock) +# define UNLOCK_FS_STRUCT(fs) cfs_spin_unlock(&(fs)->lock) +#endif + +#ifdef HAVE_FS_STRUCT_USE_PATH +static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, + struct dentry *dentry) +{ + struct path path; + struct path old_pwd; + + path.mnt = mnt; + path.dentry = dentry; + LOCK_FS_STRUCT(fs); + old_pwd = fs->pwd; + path_get(&path); + fs->pwd = path; + UNLOCK_FS_STRUCT(fs); + + if (old_pwd.dentry) + path_put(&old_pwd); +} + #else -#define ll_iattr iattr -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */ -#ifndef HAVE_SET_FS_PWD static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, struct dentry *dentry) { struct dentry *old_pwd; struct vfsmount *old_pwdmnt; - write_lock(&fs->lock); + LOCK_FS_STRUCT(fs); old_pwd = fs->pwd; old_pwdmnt = fs->pwdmnt; fs->pwdmnt = mntget(mnt); fs->pwd = dget(dentry); - write_unlock(&fs->lock); + UNLOCK_FS_STRUCT(fs); if (old_pwd) { dput(old_pwd); mntput(old_pwdmnt); } } -#else -#define ll_set_fs_pwd set_fs_pwd -#endif /* HAVE_SET_FS_PWD */ +#endif /* * set ATTR_BLOCKS to a high value to avoid any risk of collision with other @@ -85,56 +100,8 @@ 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 {mutex_unlock(&(inode)->i_mutex); } while(0) -#define LOCK_INODE_MUTEX(inode) do {mutex_lock(&(inode)->i_mutex); } while(0) -#define LOCK_INODE_MUTEX_PARENT(inode) \ -do {mutex_lock_nested(&(inode)->i_mutex, I_MUTEX_PARENT); } while(0) -#define TRYLOCK_INODE_MUTEX(inode) mutex_trylock(&(inode)->i_mutex) -#else -#define UNLOCK_INODE_MUTEX(inode) do {up(&(inode)->i_sem); } while(0) -#define LOCK_INODE_MUTEX(inode) do {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) mutex_lock(&(seq)->lock) -#define LL_SEQ_UNLOCK(seq) mutex_unlock(&(seq)->lock) -#else -#define LL_SEQ_LOCK(seq) down(&(seq)->sem) -#define LL_SEQ_UNLOCK(seq) 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) do {mutex_unlock(&(dqopt)->dqonoff_mutex); } while(0) -#define LOCK_DQONOFF_MUTEX(dqopt) do {mutex_lock(&(dqopt)->dqonoff_mutex); } while(0) -#else -#define UNLOCK_DQONOFF_MUTEX(dqopt) do {up(&(dqopt)->dqonoff_sem); } while(0) -#define LOCK_DQONOFF_MUTEX(dqopt) do {down(&(dqopt)->dqonoff_sem); } while(0) -#endif /* HAVE_DQUOTOFF_MUTEX */ - -#define current_ngroups current->group_info->ngroups -#define current_groups current->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) spin_lock(&(___dentry)->d_lock) -#define unlock_dentry(___dentry) spin_unlock(&(___dentry)->d_lock) - -#define ll_kernel_locked() kernel_locked() +#define current_ngroups current_cred()->group_info->ngroups +#define current_groups current_cred()->group_info->small_block /* * OBD need working random driver, thus all our @@ -146,25 +113,35 @@ do {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 */ -#define TryLockPage(page) TestSetPageLocked(page) -#define Page_Uptodate(page) PageUptodate(page) -#define ll_redirty_page(page) set_page_dirty(page) - -#define KDEVT_INIT(val) (val) +#ifndef HAVE_TRYLOCK_PAGE +#define trylock_page(page) (!TestSetPageLocked(page)) +#endif #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) +#else #define ll_permission(inode,mask,nd) permission(inode,mask,nd) +#endif + +#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) +#endif -#define ll_pgcache_lock(mapping) spin_lock(&mapping->page_lock) -#define ll_pgcache_unlock(mapping) spin_unlock(&mapping->page_lock) +#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_truncate_complete_page(page) \ - truncate_complete_page(page->mapping, page) #define ll_vfs_create(a,b,c,d) vfs_create(a,b,c,d) #define ll_dev_t dev_t @@ -172,11 +149,22 @@ do {mutex_lock_nested(&(inode)->i_mutex, I_MUTEX_PARENT); } while(0) #define to_kdev_t(dev) (dev) #define kdev_t_to_nr(dev) (dev) #define val_to_kdev(dev) (dev) -#define ILOOKUP(sb, ino, test, data) ilookup5(sb, ino, test, data); + +#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 cleanup_group_info(void) +static inline int cfs_cleanup_group_info(void) { struct group_info *ginfo; @@ -207,24 +195,6 @@ static inline int 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 - -#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE___D_MOVE) -#define d_move_locked(dentry, target) __d_move(dentry, target) -extern void __d_move(struct dentry *dentry, struct dentry *target); -#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))) @@ -235,9 +205,9 @@ static inline int mapping_has_pages(struct address_space *mapping) int rc = 1; ll_pgcache_lock(mapping); - if (list_empty(&mapping->dirty_pages) && - list_empty(&mapping->clean_pages) && - list_empty(&mapping->locked_pages)) { + 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); @@ -257,22 +227,18 @@ static inline int mapping_has_pages(struct address_space *mapping) #define KIOBUF_GET_BLOCKS(k) ((k)->blocks) #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7)) -#define ll_set_dflags(dentry, flags) do { dentry->d_vfs_flags |= flags; } while(0) -#define ll_vfs_symlink(dir, dentry, path, mode) vfs_symlink(dir, dentry, path) -#else -#define ll_set_dflags(dentry, flags) do { \ - spin_lock(&dentry->d_lock); \ - dentry->d_flags |= flags; \ - spin_unlock(&dentry->d_lock); \ - } while(0) #ifdef HAVE_SECURITY_PLUG #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ vfs_symlink(dir, dentry, mnt, path, mode) #else +#ifdef HAVE_4ARGS_VFS_SYMLINK #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ vfs_symlink(dir, dentry, path, mode) +#else +#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ + vfs_symlink(dir, dentry, path) #endif + #endif #ifndef container_of @@ -281,115 +247,53 @@ static inline int mapping_has_pages(struct address_space *mapping) (type *)( (char *)__mptr - offsetof(type,member) );}) #endif -#ifdef HAVE_I_ALLOC_SEM -#define UP_WRITE_I_ALLOC_SEM(i) do { up_write(&(i)->i_alloc_sem); } while (0) -#define DOWN_WRITE_I_ALLOC_SEM(i) do { down_write(&(i)->i_alloc_sem); } while(0) +#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) do { up_read(&(i)->i_alloc_sem); } while (0) -#define DOWN_READ_I_ALLOC_SEM(i) do { down_read(&(i)->i_alloc_sem); } while (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) -#else -#define UP_READ_I_ALLOC_SEM(i) do { } while (0) -#define DOWN_READ_I_ALLOC_SEM(i) do { } while (0) -#define LASSERT_I_ALLOC_SEM_READ_LOCKED(i) do { } while (0) - -#define UP_WRITE_I_ALLOC_SEM(i) do { } while (0) -#define DOWN_WRITE_I_ALLOC_SEM(i) do { } while (0) -#define LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) do { } while (0) -#endif - -#ifndef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP -#define grab_cache_page_nowait_gfp(x, y, z) grab_cache_page_nowait((x), (y)) -#endif - -#ifndef HAVE_FILEMAP_FDATAWRITE -#define filemap_fdatawrite(mapping) filemap_fdatasync(mapping) -#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 mapping_cap_writeback_dirty - if (!mapping_cap_writeback_dirty(mapping)) - rc = 0; -#else - if (mapping->backing_dev_info->memory_backed) - rc = 0; -#endif - /* do_writepages() */ - else if (mapping->a_ops->writepages) - rc = mapping->a_ops->writepages(mapping, &wbc); - else - rc = generic_writepages(mapping, &wbc); - return rc; -} +#ifdef HAVE_HIDE_VFSMOUNT_GUTS +# include <../fs/mount.h> #else -int filemap_fdatawrite_range(struct address_space *mapping, - loff_t start, loff_t end); +# define real_mount(mnt) (mnt) #endif -#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); - 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 -#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_ATOMIC_MNT_COUNT +static inline unsigned int mnt_get_count(struct vfsmount *mnt) +{ +#ifdef CONFIG_SMP + unsigned int count = 0; + int cpu; -/* task_struct */ -#ifndef HAVE_TASK_PPTR -#define p_pptr parent -#endif + for_each_possible_cpu(cpu) { + count += per_cpu_ptr(real_mount(mnt)->mnt_pcp, cpu)->mnt_count; + } -#ifndef HAVE_SB_TIME_GRAN -#ifndef HAVE_S_TIME_GRAN -#error Need s_time_gran patch! + return count; +#else + return real_mount(mnt)->mnt_count; #endif -static inline u32 get_sb_time_gran(struct super_block *sb) -{ - return sb->s_time_gran; } +#else +# define mnt_get_count(mnt) cfs_atomic_read(&(real_mount(mnt)->mnt_count)) #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) #else -#define TREE_READ_LOCK_IRQ(mapping) spin_lock_irq(&(mapping)->tree_lock) -#define TREE_READ_UNLOCK_IRQ(mapping) spin_unlock_irq(&(mapping)->tree_lock) +#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) #endif #ifdef HAVE_UNREGISTER_BLKDEV_RETURN_INT @@ -409,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 @@ -421,6 +321,22 @@ int ll_unregister_blkdev(unsigned int dev, const char *name) #define LL_RENAME_DOES_D_MOVE FS_ODD_RENAME #endif +#ifndef HAVE_D_OBTAIN_ALIAS +/* The old d_alloc_anon() didn't free the inode reference on error + * like d_obtain_alias(). Hide that difference/inconvenience here. */ +static inline struct dentry *d_obtain_alias(struct inode *inode) +{ + struct dentry *anon = d_alloc_anon(inode); + + if (anon == NULL) { + iput(inode); + anon = ERR_PTR(-ENOMEM); + } + + return anon; +} +#endif + /* add a lustre compatible layer for crypto API */ #include #ifdef HAVE_ASYNC_BLOCK_CIPHER @@ -431,8 +347,6 @@ int ll_unregister_blkdev(unsigned int dev, const char *name) #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) \ @@ -448,6 +362,15 @@ int ll_unregister_blkdev(unsigned int dev, const char *name) #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, @@ -465,12 +388,12 @@ static inline int ll_crypto_hmac(struct ll_crypto_hash *tfm, return crypto_hash_digest(&desc, sg, size, result); } static inline -unsigned int crypto_tfm_alg_max_keysize(struct crypto_blkcipher *tfm) +unsigned int ll_crypto_tfm_alg_max_keysize(struct crypto_blkcipher *tfm) { return crypto_blkcipher_tfm(tfm)->__crt_alg->cra_blkcipher.max_keysize; } static inline -unsigned int crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) +unsigned int ll_crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) { return crypto_blkcipher_tfm(tfm)->__crt_alg->cra_blkcipher.min_keysize; } @@ -485,15 +408,19 @@ unsigned int crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) #include #define ll_crypto_hash crypto_tfm #define ll_crypto_cipher crypto_tfm +#ifndef HAVE_STRUCT_HASH_DESC struct hash_desc { struct ll_crypto_hash *tfm; u32 flags; }; +#endif +#ifndef HAVE_STRUCT_BLKCIPHER_DESC struct blkcipher_desc { struct ll_crypto_cipher *tfm; void *info; u32 flags; }; +#endif #define ll_crypto_blkcipher_setkey(tfm, key, keylen) \ crypto_cipher_setkey(tfm, key, keylen) #define ll_crypto_blkcipher_set_iv(tfm, src, len) \ @@ -513,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 @@ -598,10 +527,11 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #define ll_crypto_hash_blocksize(tfm) crypto_tfm_alg_blocksize(tfm) #define ll_crypto_free_hash(tfm) crypto_free_tfm(tfm) #define ll_crypto_free_blkcipher(tfm) crypto_free_tfm(tfm) +#define ll_crypto_tfm_alg_min_keysize crypto_tfm_alg_min_keysize +#define ll_crypto_tfm_alg_max_keysize crypto_tfm_alg_max_keysize #endif /* HAVE_ASYNC_BLOCK_CIPHER */ #ifdef HAVE_SECURITY_PLUG -#define ll_remove_suid(inode,mnt) remove_suid(inode,mnt) #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 ll_vfs_link(old,mnt,dir,new,mnt1) vfs_link(old,mnt,dir,new,mnt1) @@ -613,7 +543,6 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \ vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) #else -#define ll_remove_suid(inode,mnt) remove_suid(inode) #define ll_vfs_rmdir(dir,entry,mnt) vfs_rmdir(dir,entry) #define ll_vfs_mkdir(inode,dir,mnt,mode) vfs_mkdir(inode,dir,mode) #define ll_vfs_link(old,mnt,dir,new,mnt1) vfs_link(old,dir,new) @@ -622,51 +551,215 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #define ll_security_inode_unlink(dir,entry,mnt) security_inode_unlink(dir,entry) #define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \ vfs_rename(old,old_dir,new,new_dir) +#endif /* HAVE_SECURITY_PLUG */ + +#ifdef for_each_possible_cpu +#define cfs_for_each_possible_cpu(cpu) for_each_possible_cpu(cpu) +#elif defined(for_each_cpu) +#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu) #endif -#ifndef get_cpu -#ifdef CONFIG_PREEMPT -#define get_cpu() ({ preempt_disable(); smp_processor_id(); }) -#define put_cpu() preempt_enable() +#ifdef HAVE_BIO_ENDIO_2ARG +#define cfs_bio_io_error(a,b) bio_io_error((a)) +#define cfs_bio_endio(a,b,c) bio_endio((a),(c)) #else -#define get_cpu() smp_processor_id() -#define put_cpu() +#define cfs_bio_io_error(a,b) bio_io_error((a),(b)) +#define cfs_bio_endio(a,b,c) bio_endio((a),(b),(c)) #endif -#endif /* get_cpu & put_cpu */ -#ifndef for_each_possible_cpu -#define for_each_possible_cpu(i) for_each_cpu(i) +#ifdef HAVE_FS_STRUCT_USE_PATH +#define cfs_fs_pwd(fs) ((fs)->pwd.dentry) +#define cfs_fs_mnt(fs) ((fs)->pwd.mnt) +#define cfs_path_put(nd) path_put(&(nd)->path) +#else +#define cfs_fs_pwd(fs) ((fs)->pwd) +#define cfs_fs_mnt(fs) ((fs)->pwdmnt) +#define cfs_path_put(nd) path_release(nd) +#endif + +#ifndef HAVE_SIMPLE_SETATTR +#define simple_setattr(dentry, ops) inode_setattr((dentry)->d_inode, ops) #endif -#ifndef cpu_to_node -#define cpu_to_node(cpu) 0 +#ifndef SLAB_DESTROY_BY_RCU +#define SLAB_DESTROY_BY_RCU 0 #endif -#ifndef abs -static inline int abs(int x) +#ifndef HAVE_SB_HAS_QUOTA_ACTIVE +#define sb_has_quota_active(sb, type) sb_has_quota_enabled(sb, type) +#endif + +#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 +ll_quota_on(struct super_block *sb, int off, int ver, char *name, int remount) { - return (x < 0) ? -x : x; -} + int rc; + + if (sb->s_qcop->quota_on) { +#ifdef HAVE_QUOTA_ON_USE_PATH + struct path path; + + rc = kern_path(name, LOOKUP_FOLLOW, &path); + if (!rc) + return rc; +#endif + rc = sb->s_qcop->quota_on(sb, off, ver +#ifdef HAVE_QUOTA_ON_USE_PATH + , &path +#else + , name +#endif +#ifdef HAVE_QUOTA_ON_5ARGS + , remount #endif + ); +#ifdef HAVE_QUOTA_ON_USE_PATH + path_put(&path); +#endif + return rc; + } + else + return -ENOSYS; +} -#ifndef labs -static inline long labs(long x) +static inline int ll_quota_off(struct super_block *sb, int off, int remount) { - return (x < 0) ? -x : x; + if (sb->s_qcop->quota_off) { + return sb->s_qcop->quota_off(sb, off +#ifdef HAVE_QUOTA_OFF_3ARGS + , remount +#endif + ); + } + else + return -ENOSYS; } + +#ifndef HAVE_BLK_QUEUE_LOG_BLK_SIZE /* added in 2.6.31 */ +#define blk_queue_logical_block_size(q, sz) blk_queue_hardsect_size(q, sz) #endif -/* Using kernel fls(). Userspace will use one defined in user-bitops.h. */ -#ifndef __fls -#define __fls fls +#ifndef HAVE_VFS_DQ_OFF +# define ll_vfs_dq_init DQUOT_INIT +# define ll_vfs_dq_drop DQUOT_DROP +# define ll_vfs_dq_transfer DQUOT_TRANSFER +# define ll_vfs_dq_off(sb, remount) DQUOT_OFF(sb) +#else +# define ll_vfs_dq_init vfs_dq_init +# define ll_vfs_dq_drop vfs_dq_drop +# define ll_vfs_dq_transfer vfs_dq_transfer +# define ll_vfs_dq_off(sb, remount) vfs_dq_off(sb, remount) #endif -#ifdef HAVE_INVALIDATE_INODE_PAGES -#define invalidate_mapping_pages(mapping,s,e) invalidate_inode_pages(mapping) +#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 -#ifndef SLAB_DESTROY_BY_RCU -#define SLAB_DESTROY_BY_RCU 0 +#ifdef HAVE_NEW_BACKING_DEV_INFO +# define ll_bdi_wb_cnt(bdi) ((bdi).wb_cnt) +#else +# define ll_bdi_wb_cnt(bdi) 1 +#endif + +#ifdef HAVE_BLK_QUEUE_MAX_SECTORS /* removed in rhel6 */ +#define blk_queue_max_hw_sectors(q, sect) blk_queue_max_sectors(q, sect) +#endif + +#ifndef HAVE_BLKDEV_GET_BY_DEV +# define blkdev_get_by_dev(dev, mode, holder) open_by_devnum(dev, mode) +#endif + +#ifndef HAVE_REQUEST_QUEUE_LIMITS +#define queue_max_sectors(rq) ((rq)->max_sectors) +#define queue_max_hw_sectors(rq) ((rq)->max_hw_sectors) +#define queue_max_phys_segments(rq) ((rq)->max_phys_segments) +#define queue_max_hw_segments(rq) ((rq)->max_hw_segments) +#endif + +#ifndef HAVE_BLK_QUEUE_MAX_SEGMENTS +#define blk_queue_max_segments(rq, seg) \ + do { blk_queue_max_phys_segments(rq, seg); \ + blk_queue_max_hw_segments(rq, seg); } while (0) +#else +#define queue_max_phys_segments(rq) queue_max_segments(rq) +#define queue_max_hw_segments(rq) queue_max_segments(rq) +#endif + + +#ifndef HAVE_BI_HW_SEGMENTS +#define bio_hw_segments(q, bio) 0 +#endif + +#ifndef HAVE_PAGEVEC_LRU_ADD_FILE +#define pagevec_lru_add_file pagevec_lru_add +#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) \ + 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) \ +({ \ + int __ret; \ + \ + page_cache_get(pg); \ + __ret = pagevec_add(pv, pg); \ +}) +#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 +#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 ext2_test_bit test_bit_le +# define ext2_find_first_zero_bit find_first_zero_bit_le +# define ext2_find_next_zero_bit find_next_zero_bit_le +#endif + +#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 #endif /* __KERNEL__ */