*
*/
-#ifndef _COMPAT25_H
-#define _COMPAT25_H
+#ifndef _LINUX_COMPAT25_H
+#define _LINUX_COMPAT25_H
#ifdef __KERNEL__
#error sorry, lustre requires at least 2.5.69
#endif
-#include <linux/portals_compat25.h>
+#include <libcfs/linux/portals_compat25.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#include <linux/lustre_patchless_compat.h>
+
+#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) */
+
+#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);
+ old_pwd = fs->pwd;
+ old_pwdmnt = fs->pwdmnt;
+ fs->pwdmnt = mntget(mnt);
+ fs->pwd = dget(dentry);
+ write_unlock(&fs->lock);
+
+ if (old_pwd) {
+ dput(old_pwd);
+ mntput(old_pwdmnt);
+ }
+}
+#else
+#define ll_set_fs_pwd set_fs_pwd
+#endif /* HAVE_SET_FS_PWD */
+
+/*
+ * set ATTR_BLOCKS to a high value to avoid any risk of collision with other
+ * ATTR_* attributes (see bug 13828)
+ */
+#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 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))
+#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) 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 */
+
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
+#define NGROUPS_SMALL NGROUPS
+#define NGROUPS_PER_BLOCK ((int)(EXEC_PAGESIZE / sizeof(gid_t)))
+
+struct group_info {
+ int ngroups;
+ atomic_t usage;
+ gid_t small_block[NGROUPS_SMALL];
+ int nblocks;
+ gid_t *blocks[0];
+};
+#define current_ngroups current->ngroups
+#define current_groups current->groups
+
+struct group_info *groups_alloc(int gidsetsize);
+void groups_free(struct group_info *ginfo);
+#else /* >= 2.6.4 */
+
+#define current_ngroups current->group_info->ngroups
+#define current_groups current->group_info->small_block
+
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) */
+
+#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 lock_24kernel() do {} while (0)
+#define unlock_24kernel() do {} while (0)
+#define ll_kernel_locked() kernel_locked()
/*
* OBD need working random driver, thus all our
* initialization routines must be called after device
* driver initialization
*/
+#ifndef MODULE
+#undef module_init
#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 filemap_fdatasync(mapping) filemap_fdatawrite(mapping)
-#define Page_Uptodate(page) PageUptodate(page)
+#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)
#define LTIME_S(time) (time.tv_sec)
#define ll_path_lookup path_lookup
-#define ll_permission permission
+#define ll_permission(inode,mask,nd) permission(inode,mask,nd)
#define ll_pgcache_lock(mapping) spin_lock(&mapping->page_lock)
#define ll_pgcache_unlock(mapping) 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_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)
#include <linux/writeback.h>
-static inline void lustre_daemonize_helper(void)
+static inline int cleanup_group_info(void)
{
- LASSERT(current->signal != NULL);
- current->signal->session = 1;
- current->signal->pgrp = 1;
- current->signal->tty = NULL;
+ struct group_info *ginfo;
+
+ ginfo = groups_alloc(0);
+ if (!ginfo)
+ return -ENOMEM;
+
+ set_current_groups(ginfo);
+ put_group_info(ginfo);
+
+ return 0;
}
-#define rb_node_s rb_node
-#define rb_root_s rb_root
-typedef struct rb_root_s rb_root_t;
-typedef struct rb_node_s rb_node_t;
+#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)
-#else /* 2.4.. */
+#define kiobuf bio
-#define ll_vfs_create(a,b,c,d) vfs_create(a,b,c)
-#define ll_permission(a,b,c) permission(a,b)
-#define ILOOKUP(sb, ino, test, data) ilookup4(sb, ino, test, data);
-#define DCACHE_DISCONNECTED DCACHE_NFSD_DISCONNECTED
-#define ll_dev_t int
+#include <linux/proc_fs.h>
+
+#ifndef HAVE___D_REHASH
+#define __d_rehash(dentry, lock) d_rehash_cond(dentry, lock)
+#endif
-static inline void clear_page_dirty(struct page *page)
+#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_WRITE))
+
+#ifdef HAVE_PAGE_LIST
+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)) {
+ rc = 0;
+ }
+ ll_pgcache_unlock(mapping);
+
+ return rc;
+}
+#else
+static inline int mapping_has_pages(struct address_space *mapping)
{
- if (PageDirty(page))
- ClearPageDirty(page);
+ return mapping->nrpages > 0;
}
+#endif
-/* 2.5 uses hlists for some things, like the d_hash. we'll treat them
- * as 2.5 and let macros drop back.. */
-#ifndef HLIST_HEAD /* until we get a kernel newer than l28 */
-#define hlist_entry list_entry
-#define hlist_head list_head
-#define hlist_node list_head
-#define HLIST_HEAD LIST_HEAD
-#define INIT_HLIST_HEAD INIT_LIST_HEAD
-#define hlist_del_init list_del_init
-#define hlist_add_head list_add
-#define hlist_for_each_safe list_for_each_safe
+#ifdef HAVE_KIOBUF_KIO_BLOCKS
+#define KIOBUF_GET_BLOCKS(k) ((k)->kio_blocks)
+#else
+#define KIOBUF_GET_BLOCKS(k) ((k)->blocks)
#endif
-#define KDEVT_INIT(val) (val)
-#define ext3_xattr_set_handle ext3_xattr_set
-#define extN_xattr_set_handle extN_xattr_set
-#define try_module_get __MOD_INC_USE_COUNT
-#define module_put __MOD_DEC_USE_COUNT
-#define LTIME_S(time) (time)
-#ifndef CONFIG_RH_2_4_20
-#define cpu_online(cpu) (cpu_online_map & (1<<cpu))
+
+#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)
+#define ll_vfs_symlink(dir, dentry, path, mode) vfs_symlink(dir, dentry, path, mode)
#endif
-static inline int ll_path_lookup(const char *path, unsigned flags,
- struct nameidata *nd)
-{
- int error = 0;
- if (path_init(path, flags, nd))
- error = path_walk(path, nd);
- return error;
-}
-#define ll_permission(a,b,c) permission(a,b)
-typedef long sector_t;
+#ifndef container_of
+#define container_of(ptr, type, member) ({ \
+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+ (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 LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) LASSERT(down_read_trylock(&(i)->i_alloc_sem) == 0)
-#define ll_pgcache_lock(mapping) spin_lock(&pagecache_lock)
-#define ll_pgcache_unlock(mapping) spin_unlock(&pagecache_lock)
+#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 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
-static inline void __d_drop(struct dentry *dentry)
+#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
+
+#ifdef HAVE_VFS_KERN_MOUNT
+static inline
+struct vfsmount *
+ll_kern_mount(const char *fstype, int flags, const char *name, void *data)
{
- list_del(&dentry->d_hash);
- INIT_LIST_HEAD(&dentry->d_hash);
+ 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;
}
+#else
+#define ll_kern_mount(fstype, flags, name, data) do_kern_mount((fstype), (flags), (name), (data))
+#endif
-static inline void lustre_daemonize_helper(void)
+#ifndef HAVE_GENERIC_FILE_READ
+static inline
+ssize_t
+generic_file_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
{
- current->session = 1;
- current->pgrp = 1;
- current->tty = NULL;
+ struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
+ struct kiocb kiocb;
+ ssize_t ret;
+
+ init_sync_kiocb(&kiocb, filp);
+ kiocb.ki_pos = *ppos;
+ kiocb.ki_left = len;
+
+ ret = generic_file_aio_read(&kiocb, &iov, 1, kiocb.ki_pos);
+ *ppos = kiocb.ki_pos;
+ return ret;
}
+#endif
-#ifndef conditional_schedule
-#define conditional_schedule() if (unlikely(need_resched())) schedule()
+#ifndef HAVE_GENERIC_FILE_WRITE
+static inline
+ssize_t
+generic_file_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
+{
+ struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
+ struct kiocb kiocb;
+ ssize_t ret;
+
+ init_sync_kiocb(&kiocb, filp);
+ kiocb.ki_pos = *ppos;
+ kiocb.ki_left = len;
+
+ ret = generic_file_aio_write(&kiocb, &iov, 1, kiocb.ki_pos);
+ *ppos = kiocb.ki_pos;
+
+ return ret;
+}
#endif
-/* 2.6 has the lovely PagePrivate bit for indicating that a filesystem
- * has hung state off of page->private. We use it. */
-#define PG_private 9 /* unused in 2.4, apparently. */
-#define SetPagePrivate(page) set_bit(PG_private, &(page)->flags)
-#define ClearPagePrivate(page) clear_bit(PG_private, &(page)->flags)
-#define PagePrivate(page) test_bit(PG_private, &(page)->flags)
+#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
-#endif /* end of 2.4 compat macros */
+/* task_struct */
+#ifndef HAVE_TASK_PPTR
+#define p_pptr parent
+#endif
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff