* 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, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
# define UNLOCK_FS_STRUCT(fs) 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)
{
path_put(&old_pwd);
}
-#else
-
-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;
-
- LOCK_FS_STRUCT(fs);
- old_pwd = fs->pwd;
- old_pwdmnt = fs->pwdmnt;
- fs->pwdmnt = mntget(mnt);
- fs->pwd = dget(dentry);
- UNLOCK_FS_STRUCT(fs);
-
- if (old_pwd) {
- dput(old_pwd);
- mntput(old_pwdmnt);
- }
-}
-#endif
-
/*
* set ATTR_BLOCKS to a high value to avoid any risk of collision with other
* ATTR_* attributes (see bug 13828)
#define module_init(a) late_initcall(a)
#endif
-#ifndef HAVE_TRYLOCK_PAGE
-#define trylock_page(page) (!TestSetPageLocked(page))
-#endif
-
#define LTIME_S(time) (time.tv_sec)
-#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)
generic_permission(inode, mask, check_acl)
#endif
-#ifdef HAVE_BLKDEV_PUT_2ARGS
-#define ll_blkdev_put(a, b) blkdev_put(a, b)
+#ifdef HAVE_DENTRY_OPEN_USE_PATH
+#define ll_dentry_open(a,b,c) dentry_open(a,b,c)
#else
-#define ll_blkdev_put(a, b) blkdev_put(a)
-#endif
-
-static inline struct file *ll_dentry_open(struct dentry *dentry,
- struct vfsmount *mnt, int flags,
+/*
+ * 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)
{
-#ifdef HAVE_DENTRY_OPEN_USE_PATH
- struct path path = { .mnt = mnt, .dentry = dentry };
- return dentry_open(&path, flags, cred);
-#elif defined HAVE_DENTRY_OPEN_4ARGS
- return dentry_open(dentry, mnt, flags, cred);
-#else
- return dentry_open(dentry, mnt, flags);
-#endif
+ mntget(path->mnt);
+ dget(path->dentry);
+ return dentry_open(path->dentry, path->mnt, flags, cred);
}
+#endif
-#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)
vfs_symlink(dir, dentry, path)
#endif
+#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
+#define ll_generic_file_llseek_size(file, offset, origin, maxbytes, eof) \
+ generic_file_llseek_size(file, offset, origin, maxbytes);
#endif
#ifdef HAVE_INODE_DIO_WAIT
# 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)
-#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)
-#endif
-
-#ifdef HAVE_UNREGISTER_BLKDEV_RETURN_INT
-#define ll_unregister_blkdev(a,b) unregister_blkdev((a),(b))
-#else
-static inline
-int ll_unregister_blkdev(unsigned int dev, const char *name)
-{
- unregister_blkdev(dev, name);
- return 0;
-}
-#endif
-
-#ifdef HAVE_INVALIDATE_BDEV_2ARG
-#define ll_invalidate_bdev(a,b) invalidate_bdev((a),(b))
-#else
-#define ll_invalidate_bdev(a,b) invalidate_bdev((a))
-#endif
-
#ifndef FS_HAS_FIEMAP
#define FS_HAS_FIEMAP (0)
#endif
-#ifndef HAVE_FS_RENAME_DOES_D_MOVE
-#define FS_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 <linux/crypto.h>
-#ifdef HAVE_ASYNC_BLOCK_CIPHER
#define ll_crypto_hash crypto_hash
#define ll_crypto_cipher crypto_blkcipher
#define ll_crypto_alloc_hash(name, type, mask) crypto_alloc_hash(name, type, mask)
#define ll_crypto_blkcipher_blocksize(tfm) crypto_blkcipher_blocksize(tfm)
#define ll_crypto_free_hash(tfm) crypto_free_hash(tfm)
#define ll_crypto_free_blkcipher(tfm) crypto_free_blkcipher(tfm)
-#else /* HAVE_ASYNC_BLOCK_CIPHER */
-#include <linux/scatterlist.h>
-#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) \
- crypto_cipher_set_iv(tfm, src, len)
-#define ll_crypto_blkcipher_get_iv(tfm, dst, len) \
- crypto_cipher_get_iv(tfm, dst, len)
-#define ll_crypto_blkcipher_encrypt(desc, dst, src, bytes) \
- crypto_cipher_encrypt((desc)->tfm, dst, src, bytes)
-#define ll_crypto_blkcipher_decrypt(desc, dst, src, bytes) \
- crypto_cipher_decrypt((desc)->tfm, dst, src, bytes)
-#define ll_crypto_blkcipher_decrypt_iv(desc, dst, src, bytes) \
- crypto_cipher_decrypt_iv((desc)->tfm, dst, src, bytes, (desc)->info)
-#define ll_crypto_blkcipher_encrypt_iv(desc, dst, src, bytes) \
- crypto_cipher_encrypt_iv((desc)->tfm, dst, src, bytes, (desc)->info)
-
-static inline
-struct ll_crypto_cipher *ll_crypto_alloc_blkcipher(const char * algname,
- u32 type, u32 mask)
-{
- 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
-struct ll_crypto_hash *ll_crypto_alloc_hash(const char *alg, u32 type, u32 mask)
-{
- char buf[CRYPTO_MAX_ALG_NAME + 1];
- const char *pan = alg;
-
- if (strncmp("hmac(", alg, 5) == 0) {
- char *vp = strnchr(alg, CRYPTO_MAX_ALG_NAME, ')');
- if (vp) {
- memcpy(buf, alg+ 5, vp - alg- 5);
- buf[vp - alg - 5] = 0x00;
- pan = buf;
- }
- }
- return crypto_alloc_tfm(pan, 0);
-}
-static inline int ll_crypto_hash_init(struct hash_desc *desc)
-{
- crypto_digest_init(desc->tfm); return 0;
-}
-static inline int ll_crypto_hash_update(struct hash_desc *desc,
- struct scatterlist *sg,
- unsigned int nbytes)
-{
- struct scatterlist *sl = sg;
- unsigned int count;
- /*
- * This way is very weakness. We must ensure that
- * the sum of sg[0..i]->length isn't greater than nbytes.
- * In the upstream kernel the crypto_hash_update() also
- * via the nbytes computed the count of sg[...].
- * The old style is more safely. but it gone.
- */
- for (count = 0; nbytes > 0; count ++, sl ++) {
- nbytes -= sl->length;
- }
- crypto_digest_update(desc->tfm, sg, count); return 0;
-}
-static inline int ll_crypto_hash_final(struct hash_desc *desc, u8 *out)
-{
- crypto_digest_final(desc->tfm, out); return 0;
-}
-static inline int ll_crypto_hmac(struct crypto_tfm *tfm,
- u8 *key, unsigned int *keylen,
- struct scatterlist *sg,
- unsigned int nbytes,
- u8 *out)
-{
- struct scatterlist *sl = sg;
- int count;
- for (count = 0; nbytes > 0; count ++, sl ++) {
- nbytes -= sl->length;
- }
- crypto_hmac(tfm, key, keylen, sg, count, out);
- return 0;
-}
-
-#define ll_crypto_hash_setkey(tfm, key, keylen) crypto_digest_setkey(tfm, key, keylen)
-#define ll_crypto_blkcipher_blocksize(tfm) crypto_tfm_alg_blocksize(tfm)
-#define ll_crypto_blkcipher_ivsize(tfm) crypto_tfm_alg_ivsize(tfm)
-#define ll_crypto_hash_digestsize(tfm) crypto_tfm_alg_digestsize(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_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)
-#define ll_vfs_unlink(inode,entry,mnt) vfs_unlink(inode,entry,mnt)
-#define ll_vfs_mknod(dir,entry,mnt,mode,dev) \
- vfs_mknod(dir,entry,mnt,mode,dev)
-#define ll_security_inode_unlink(dir,entry,mnt) \
- security_inode_unlink(dir,entry,mnt)
-#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_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)
-#define ll_vfs_unlink(inode,entry,mnt) vfs_unlink(inode,entry)
-#define ll_vfs_mknod(dir,entry,mnt,mode,dev) vfs_mknod(dir,entry,mode,dev)
-#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)
#define cfs_bio_endio(a,b,c) bio_endio((a),(b),(c))
#endif
-#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
#define SLAB_DESTROY_BY_RCU 0
#endif
-#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)
-{
- 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;
-}
-
-static inline int ll_quota_off(struct super_block *sb, int off, int remount)
-{
- 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
-
-#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
+#ifndef HAVE_DQUOT_SUSPEND
# 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_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
-#endif
-
-#ifdef HAVE_BLK_QUEUE_MAX_SECTORS /* removed in rhel6 */
-#define blk_queue_max_hw_sectors(q, sect) blk_queue_max_sectors(q, sect)
+# 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
#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); \
#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)
+#ifdef HAVE_HLIST_FOR_EACH_3ARG
+#define ll_d_hlist_for_each_entry(dentry, p, i_dentry, alias) \
+ p = NULL; hlist_for_each_entry(dentry, i_dentry, alias)
+#else
#define ll_d_hlist_for_each_entry(dentry, p, i_dentry, alias) \
hlist_for_each_entry(dentry, p, i_dentry, alias)
+#endif
+#define DECLARE_LL_D_HLIST_NODE_PTR(name) struct ll_d_hlist_node *name
#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
-#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
+ list_for_each_entry(dentry, i_dentry, alias)
+#define DECLARE_LL_D_HLIST_NODE_PTR(name) /* nothing */
#endif
#ifndef QUOTA_OK
# 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
+#ifdef HAVE_DIRTY_INODE_HAS_FLAG
+# define ll_dirty_inode(inode, flag) (inode)->i_sb->s_op->dirty_inode((inode), flag)
+#else
+# define ll_dirty_inode(inode, flag) (inode)->i_sb->s_op->dirty_inode((inode))
+#endif
+
#endif /* _COMPAT25_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff