X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_compat25.h;h=13363bd4935683a6186f141e15e52d6d26c53985;hb=023376307ceb250d1620e6ec77344dab7ed4edd2;hp=a142e9bddd01f263544711da781020b84dea4cba;hpb=bf0e356263dcf9b83f485450436e5e61a7acebd1;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index a142e9b..13363bd 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -32,24 +32,99 @@ #include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -# define PGCACHE_WRLOCK(mapping) write_lock(&mapping->page_lock) -# define PGCACHE_WRUNLOCK(mapping) write_unlock(&mapping->page_lock) -#define KDEVT_INIT(val) { .value = val } +/* + * 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 KDEVT_INIT(val) (val) + #define LTIME_S(time) (time.tv_sec) #define ll_path_lookup path_lookup - +#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_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) +#define ILOOKUP(sb, ino, test, data) ilookup5(sb, ino, test, data); + +#include + +static inline void lustre_daemonize_helper(void) +{ + LASSERT(current->signal != NULL); + current->signal->session = 1; + if (current->group_leader) + current->group_leader->signal->pgrp = 1; + else + CERROR("we aren't group leader\n"); + current->signal->tty = NULL; +} + +static inline int cleanup_group_info(void) +{ + struct group_info *ginfo; + + ginfo = groups_alloc(2); + if (!ginfo) + return -ENOMEM; + + ginfo->ngroups = 0; + set_current_groups(ginfo); + put_group_info(ginfo); + + return 0; +} + +#define smp_num_cpus NR_CPUS + +#ifndef conditional_schedule +#define conditional_schedule() cond_resched() +#endif + +#include #else /* 2.4.. */ -# define PGCACHE_WRLOCK(mapping) spin_lock(&pagecache_lock) -# define PGCACHE_WRUNLOCK(mapping) spin_unlock(&pagecache_lock) +#define ll_vfs_create(a,b,c,d) vfs_create(a,b,c) +#define ll_permission(inode,mask,nd) permission(inode,mask) +#define ILOOKUP(sb, ino, test, data) ilookup4(sb, ino, test, data); +#define DCACHE_DISCONNECTED DCACHE_NFSD_DISCONNECTED +#define ll_dev_t int + +static inline void clear_page_dirty(struct page *page) +{ + if (PageDirty(page)) + ClearPageDirty(page); +} /* 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 @@ -58,49 +133,102 @@ #define hlist_del_init list_del_init #define hlist_add_head list_add #define hlist_for_each_safe list_for_each_safe +#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 +#if !defined(CONFIG_RH_2_4_20) && !defined(cpu_online) #define cpu_online(cpu) (cpu_online_map & (1<i_mapping->a_ops->writepage(page) +#define ll_invalidate_inode_pages(inode) invalidate_inode_pages(inode) +#define ll_truncate_complete_page(page) truncate_complete_page(page) -#endif /* end of 2.4 compat macros */ +static inline void __d_drop(struct dentry *dentry) +{ + list_del(&dentry->d_hash); + INIT_LIST_HEAD(&dentry->d_hash); +} -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -# define filemap_fdatasync(mapping) filemap_fdatawrite(mapping) -#endif +static inline void lustre_daemonize_helper(void) +{ + current->session = 1; + current->pgrp = 1; + current->tty = NULL; +} +static inline int cleanup_group_info(void) +{ + /* Get rid of unneeded supplementary groups */ + current->ngroups = 0; + memset(current->groups, 0, sizeof(current->groups)); + return 0; +} -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -# define TryLockPage(page) TestSetPageLocked(page) +#ifndef conditional_schedule +#define conditional_schedule() if (unlikely(need_resched())) schedule() #endif - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -# define Page_Uptodate(page) PageUptodate(page) +/* to find proc_dir_entry from inode. 2.6 has native one -bzzz */ +#ifndef HAVE_PDE +#define PDE(ii) ((ii)->u.generic_ip) #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,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; +#endif /* end of 2.4 compat macros */ + +#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; +} + +static inline int clear_page_dirty_for_io(struct page *page) +{ + struct address_space *mapping = page->mapping; + + if (page->mapping && PageDirty(page)) { + ClearPageDirty(page); + ll_pgcache_lock(mapping); + list_del(&page->list); + list_add(&page->list, &mapping->locked_pages); + ll_pgcache_unlock(mapping); + return 1; + } + return 0; +} +#else +static inline int mapping_has_pages(struct address_space *mapping) +{ + return mapping->nrpages > 0; +} #endif #endif /* __KERNEL__ */