#define ll_iattr iattr
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
+#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;
+ write_lock(&fs->lock);
+ old_pwd = fs->pwd;
+ path_get(&path);
+ fs->pwd = path;
+ write_unlock(&fs->lock);
+
+ if (old_pwd.dentry)
+ path_put(&old_pwd);
+}
+
+#else
+
static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
struct dentry *dentry)
{
mntput(old_pwdmnt);
}
}
+#endif
/*
* set ATTR_BLOCKS to a high value to avoid any risk of collision with other
#endif
/* XXX our code should be using the 2.6 calls, not the other way around */
-#define TryLockPage(page) TestSetPageLocked(page)
+#ifdef HAVE_TRYLOCK_PAGE
+#define TestSetPageLocked(page) (!trylock_page(page))
+#endif
+
#define Page_Uptodate(page) PageUptodate(page)
#define ll_redirty_page(page) set_page_dirty(page)
#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);
+#define ILOOKUP(sb, ino, test, data) ilookup5(sb, ino, test, (void *)(data));
#include <linux/writeback.h>
#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)
+#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
+
#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
-#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \
- vfs_symlink(dir, dentry, path, mode)
-#endif
#endif
#ifndef container_of
(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 <linux/mpage.h> /* for generic_writepages */
#ifndef HAVE_FILEMAP_FDATAWRITE_RANGE
#include <linux/backing-dev.h> /* for mapping->backing_dev_info */
wbc.end = end;
#endif
-#ifdef mapping_cap_writeback_dirty
+#ifdef HAVE_MAPPING_CAP_WRITEBACK_DIRTY
if (!mapping_cap_writeback_dirty(mapping))
rc = 0;
#else
#else
int filemap_fdatawrite_range(struct address_space *mapping,
loff_t start, loff_t end);
-#endif
+#endif /* HAVE_FILEMAP_FDATAWRITE_RANGE */
#ifdef HAVE_VFS_KERN_MOUNT
-static inline
-struct vfsmount *
+static inline struct vfsmount *
ll_kern_mount(const char *fstype, int flags, const char *name, void *data)
{
struct file_system_type *type = get_fs_type(fstype);
#define ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb), (sfs))
#endif
-/* task_struct */
-#ifndef HAVE_TASK_PPTR
-#define p_pptr parent
-#endif
-
#ifndef HAVE_SB_TIME_GRAN
#ifndef HAVE_S_TIME_GRAN
#error Need s_time_gran patch!
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;
}
#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) \
#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 */
+#ifndef HAVE_SYNCHRONIZE_RCU
+#define synchronize_rcu() synchronize_kernel()
+#endif
+
+#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_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)
#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)
#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
-
-#ifndef get_cpu
-#ifdef CONFIG_PREEMPT
-#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
-#define put_cpu() preempt_enable()
-#else
-#define get_cpu() smp_processor_id()
-#define put_cpu()
-#endif
-#endif /* get_cpu & put_cpu */
+#endif /* HAVE_SECURITY_PLUG */
#ifndef for_each_possible_cpu
#define for_each_possible_cpu(i) for_each_cpu(i)
#define cpu_to_node(cpu) 0
#endif
+#ifdef HAVE_REGISTER_SHRINKER
+typedef int (*shrinker_t)(int nr_to_scan, gfp_t gfp_mask);
+
+static inline
+struct shrinker *set_shrinker(int seek, shrinker_t func)
+{
+ struct shrinker *s;
+
+ s = kmalloc(sizeof(*s), GFP_KERNEL);
+ if (s == NULL)
+ return (NULL);
+
+ s->shrink = func;
+ s->seeks = seek;
+
+ register_shrinker(s);
+
+ return s;
+}
+
+static inline
+void remove_shrinker(struct shrinker *shrinker)
+{
+ if (shrinker == NULL)
+ return;
+
+ unregister_shrinker(shrinker);
+ kfree(shrinker);
+}
+#endif
+
+#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 cfs_bio_io_error(a,b) bio_io_error((a),(b))
+#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 abs
static inline int abs(int x)
{
{
return (x < 0) ? -x : x;
}
-#endif
+#endif /* HAVE_REGISTER_SHRINKER */
/* Using kernel fls(). Userspace will use one defined in user-bitops.h. */
#ifndef __fls
#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)
+#endif
+
+#ifdef 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)
+#endif
+
+static inline int
+ll_quota_on(struct super_block *sb, int off, int ver, char *name, int remount)
+{
+ if (sb->s_qcop->quota_on) {
+ return sb->s_qcop->quota_on(sb, off, ver, name
+#ifdef HAVE_QUOTA_ON_5ARGS
+ , remount
+#endif
+ );
+ }
+ 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;
+}
+
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff