X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fliblustre.h;h=cf4179060650e34ff57067bbe14ea1fbb648e978;hp=c809c7c54fc7b26f434f90ed2bd8264aea473e9a;hb=a067251099b6b225f2409f680d9e4423253d0730;hpb=0ff1bfc429c3e9d4fced60212e37a8a996586175 diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h index c809c7c..cf41790 100644 --- a/lustre/include/liblustre.h +++ b/lustre/include/liblustre.h @@ -1,287 +1,120 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2001 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * User-space Lustre headers. + * GPL HEADER END + */ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, 2013, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/include/liblustre.h * + * User-space Lustre headers. */ + #ifndef LIBLUSTRE_H__ #define LIBLUSTRE_H__ -#ifdef __KERNEL__ -#error Kernel files should not #include -#else -/* - * The userspace implementations of linux/spinlock.h vary; we just - * include our own for all of them +/** \defgroup liblustre liblustre + * + * @{ */ -#define __LINUX_SPINLOCK_H -#endif - -#include -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_ASM_PAGE_H -# include -#endif -#ifdef HAVE_SYS_USER_H -# include -#endif -#ifdef HAVE_SYS_IOCTL_H -# include -#endif -#ifndef _IOWR -# include "ioctl.h" -#endif +#include +#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_VFS_H -# include +#ifdef __KERNEL__ +#error Kernel files should not #include #endif -#include -#include -#include -#include +#include #include -#include /* definitions for liblustre */ #ifdef __CYGWIN__ -#define CFS_PAGE_SHIFT 12 -#define CFS_PAGE_SIZE (1UL << CFS_PAGE_SHIFT) -#define CFS_PAGE_MASK (~((__u64)CFS_PAGE_SIZE-1)) #define loff_t long long #define ERESTART 2001 -typedef unsigned short umode_t; - -#endif +typedef unsigned short cfs_umode_t; -#ifndef CURRENT_SECONDS -# define CURRENT_SECONDS time(0) #endif -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(a) ((sizeof (a))/(sizeof ((a)[0]))) -#endif - -/* This is because lprocfs_status.h gets included here indirectly. It would - * be much better to just avoid lprocfs being included into liblustre entirely - * but that requires more header surgery than I can handle right now. - */ -#ifndef smp_processor_id -#define smp_processor_id() 0 -#endif -#ifndef num_online_cpus -#define num_online_cpus() 1 -#endif -#ifndef num_possible_cpus -#define num_possible_cpus() 1 -#endif - -/* always adopt 2.5 definitions */ -#define KERNEL_VERSION(a,b,c) ((a)*100+(b)*10+c) -#define LINUX_VERSION_CODE KERNEL_VERSION(2,6,5) - #ifndef page_private #define page_private(page) ((page)->private) #define set_page_private(page, v) ((page)->private = (v)) #endif +/* + * The inter_module_get implementation is specific to liblustre, so this needs + * to stay here for now. + */ static inline void inter_module_put(void *a) { return; } - void *inter_module_get(char *arg); -/* cheats for now */ - -struct work_struct { - void (*ws_task)(void *arg); - void *ws_arg; -}; - -static inline void prepare_work(struct work_struct *q, void (*t)(void *), - void *arg) -{ - q->ws_task = t; - q->ws_arg = arg; - return; -} - -static inline void schedule_work(struct work_struct *q) -{ - q->ws_task(q->ws_arg); -} - - -#define strnlen(a,b) strlen(a) -static inline void *kmalloc(int size, int prot) -{ - return malloc(size); -} -#define vmalloc malloc -#define vfree free -#define kfree(a) free(a) -#define GFP_KERNEL 1 -#define GFP_HIGHUSER 1 -#define GFP_ATOMIC 1 -#define GFP_NOFS 1 -#define IS_ERR(a) ((unsigned long)(a) > (unsigned long)-1000L) -#define PTR_ERR(a) ((long)(a)) -#define ERR_PTR(a) ((void*)((long)(a))) - -typedef int (read_proc_t)(char *page, char **start, off_t off, - int count, int *eof, void *data); - -struct file; /* forward ref */ -typedef int (write_proc_t)(struct file *file, const char *buffer, - unsigned long count, void *data); - -#define NIPQUAD(addr) \ - ((unsigned char *)&addr)[0], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[3] - -#if defined(__LITTLE_ENDIAN) -#define HIPQUAD(addr) \ - ((unsigned char *)&addr)[3], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[0] -#elif defined(__BIG_ENDIAN) -#define HIPQUAD NIPQUAD -#else -#error "Undefined byteorder??" -#endif /* __LITTLE_ENDIAN */ - /* bits ops */ /* a long can be more than 32 bits, so use BITS_PER_LONG * to allow the compiler to adjust the bit shifting accordingly */ -/* test if bit nr is set in bitmap addr; returns previous value of bit nr */ -static __inline__ int set_bit(int nr, long * addr) -{ - long mask; - - addr += nr / BITS_PER_LONG; - mask = 1UL << (nr & (BITS_PER_LONG - 1)); - nr = (mask & *addr) != 0; - *addr |= mask; - return nr; -} - -/* clear bit nr in bitmap addr; returns previous value of bit nr*/ -static __inline__ int clear_bit(int nr, long * addr) -{ - long mask; - - addr += nr / BITS_PER_LONG; - mask = 1UL << (nr & (BITS_PER_LONG - 1)); - nr = (mask & *addr) != 0; - *addr &= ~mask; - return nr; -} - -static __inline__ int test_bit(int nr, const long * addr) -{ - return ((1UL << (nr & (BITS_PER_LONG - 1))) & ((addr)[nr / BITS_PER_LONG])) != 0; -} - static __inline__ int ext2_set_bit(int nr, void *addr) { - return set_bit(nr, (long*)addr); +#ifdef __BIG_ENDIAN + return set_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr); +#else + return set_bit(nr, addr); +#endif } -static __inline__ int ext2_clear_bit(int nr, void *addr) +static inline int ext2_clear_bit(int nr, void *addr) { - return clear_bit(nr, (long*)addr); +#ifdef __BIG_ENDIAN + return clear_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr); +#else + return clear_bit(nr, addr); +#endif } static __inline__ int ext2_test_bit(int nr, void *addr) { - return test_bit(nr, (long*)addr); -} - -/* modules */ - -struct module { - int count; -}; - -static inline void MODULE_AUTHOR(char *name) -{ - printf("%s\n", name); -} -#define MODULE_DESCRIPTION(name) MODULE_AUTHOR(name) -#define MODULE_LICENSE(name) MODULE_AUTHOR(name) - -#define THIS_MODULE NULL -#define __init -#define __exit - -/* devices */ - -static inline int misc_register(void *foo) -{ - return 0; -} - -static inline int misc_deregister(void *foo) -{ - return 0; -} - -static inline int request_module(char *name) -{ - return (-EINVAL); -} - -#define __MOD_INC_USE_COUNT(m) do {} while (0) -#define __MOD_DEC_USE_COUNT(m) do {} while (0) -#define MOD_INC_USE_COUNT do {} while (0) -#define MOD_DEC_USE_COUNT do {} while (0) -static inline void __module_get(struct module *module) -{ -} - -static inline int try_module_get(struct module *module) -{ - return 1; +#ifdef __BIG_ENDIAN + __const__ unsigned char *tmp = (__const__ unsigned char *) addr; + return (tmp[nr >> 3] >> (nr & 7)) & 1; +#else + return test_bit(nr, addr); +#endif } -static inline void module_put(struct module *module) -{ -} /* module initialization */ extern int init_obdclass(void); @@ -298,39 +131,13 @@ extern int echo_client_init(void); /* general stuff */ -#define EXPORT_SYMBOL(S) - -struct rcu_head { }; - -typedef struct { } spinlock_t; -typedef __u64 kdev_t; - -#define SPIN_LOCK_UNLOCKED (spinlock_t) { } -#define LASSERT_SPIN_LOCKED(lock) do {} while(0) -#define LASSERT_SEM_LOCKED(sem) do {} while(0) - -static inline void spin_lock(spinlock_t *l) {return;} -static inline void spin_unlock(spinlock_t *l) {return;} -static inline void spin_lock_init(spinlock_t *l) {return;} -static inline void local_irq_save(unsigned long flag) {return;} -static inline void local_irq_restore(unsigned long flag) {return;} -static inline int spin_is_locked(spinlock_t *l) {return 1;} - -static inline void spin_lock_bh(spinlock_t *l) {} -static inline void spin_unlock_bh(spinlock_t *l) {} -static inline void spin_lock_irqsave(spinlock_t *a, unsigned long b) {} -static inline void spin_unlock_irqrestore(spinlock_t *a, unsigned long b) {} - -typedef spinlock_t rwlock_t; -#define RW_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED -#define read_lock(l) spin_lock(l) -#define read_unlock(l) spin_unlock(l) -#define write_lock(l) spin_lock(l) -#define write_unlock(l) spin_unlock(l) - - +#ifndef min #define min(x,y) ((x)<(y) ? (x) : (y)) +#endif + +#ifndef max #define max(x,y) ((x)>(y) ? (x) : (y)) +#endif #ifndef min_t #define min_t(type,x,y) \ @@ -347,125 +154,18 @@ typedef spinlock_t rwlock_t; #ifndef ERESTARTSYS #define ERESTARTSYS ERESTART #endif -#define HZ 1 +#define CFS_HZ 1 /* random */ -void get_random_bytes(void *ptr, int size); +void cfs_get_random_bytes(void *ptr, int size); /* memory */ /* memory size: used for some client tunables */ -#define num_physpages (256 * 1024) /* 1GB */ - -static inline int copy_from_user(void *a,void *b, int c) -{ - memcpy(a,b,c); - return 0; -} - -static inline int copy_to_user(void *a,void *b, int c) -{ - memcpy(a,b,c); - return 0; -} - - -/* slabs */ -typedef struct { - int size; -} kmem_cache_t; -#define SLAB_HWCACHE_ALIGN 0 -static inline kmem_cache_t * -kmem_cache_create(const char *name, size_t objsize, size_t cdum, - unsigned long d, - void (*e)(void *, kmem_cache_t *, unsigned long), - void (*f)(void *, kmem_cache_t *, unsigned long)) -{ - kmem_cache_t *c; - c = malloc(sizeof(*c)); - if (!c) - return NULL; - c->size = objsize; - CDEBUG(D_MALLOC, "alloc slab cache %s at %p, objsize %d\n", - name, c, (int)objsize); - return c; -}; - -static inline int kmem_cache_destroy(kmem_cache_t *a) -{ - CDEBUG(D_MALLOC, "destroy slab cache %p, objsize %u\n", a, a->size); - free(a); - return 0; -} - -/* struct page decl moved out from here into portals/include/libcfs/user-prim.h */ - -/* 2.4 defines */ -#define PAGE_LIST_ENTRY list -#define PAGE_LIST(page) ((page)->list) - -#define kmap(page) (page)->addr -#define kunmap(a) do {} while (0) +#define num_physpages (256 * 1024) /* 1GB */ +#define NUM_CACHEPAGES num_physpages -static inline cfs_page_t *alloc_pages(int mask, unsigned long order) -{ - cfs_page_t *pg = malloc(sizeof(*pg)); - - if (!pg) - return NULL; -#if 0 //#ifdef MAP_ANONYMOUS - pg->addr = mmap(0, PAGE_SIZE << order, PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); -#else - pg->addr = malloc(CFS_PAGE_SIZE << order); -#endif - - if (!pg->addr) { - free(pg); - return NULL; - } - return pg; -} -#define cfs_alloc_pages(mask, order) alloc_pages((mask), (order)) - -#define alloc_page(mask) alloc_pages((mask), 0) -#define cfs_alloc_page(mask) alloc_page(mask) - -static inline void __free_pages(cfs_page_t *pg, int what) -{ -#if 0 //#ifdef MAP_ANONYMOUS - munmap(pg->addr, PAGE_SIZE); -#else - free(pg->addr); -#endif - free(pg); -} -#define __cfs_free_pages(pg, order) __free_pages((pg), (order)) - -#define __free_page(page) __free_pages((page), 0) -#define free_page(page) __free_page(page) -#define __cfs_free_page(page) __cfs_free_pages((page), 0) - -static inline cfs_page_t* __grab_cache_page(unsigned long index) -{ - cfs_page_t *pg = alloc_pages(0, 0); - - if (pg) - pg->index = index; - return pg; -} - -#define grab_cache_page(index) __grab_cache_page(index) -#define page_cache_release(page) __free_pages(page, 0) - -/* arithmetic */ -#define do_div(a,b) \ - ({ \ - unsigned long remainder;\ - remainder = (a) % (b); \ - (a) = (a) / (b); \ - (remainder); \ - }) /* VFS stuff */ #define ATTR_MODE 0x0001 @@ -485,10 +185,11 @@ static inline cfs_page_t* __grab_cache_page(unsigned long index) #define ATTR_BLOCKS 0x4000 #define ATTR_KILL_SUID 0 #define ATTR_KILL_SGID 0 +#define ATTR_FILE 0 struct iattr { unsigned int ia_valid; - umode_t ia_mode; + cfs_umode_t ia_mode; uid_t ia_uid; gid_t ia_gid; loff_t ia_size; @@ -498,31 +199,21 @@ struct iattr { unsigned int ia_attr_flags; }; -#define ll_iattr iattr - -#define IT_OPEN 0x0001 -#define IT_CREAT 0x0002 -#define IT_READDIR 0x0004 -#define IT_GETATTR 0x0008 -#define IT_LOOKUP 0x0010 -#define IT_UNLINK 0x0020 -#define IT_GETXATTR 0x0040 -#define IT_EXEC 0x0080 -#define IT_PIN 0x0100 - -#define IT_FL_LOCKED 0x0001 -#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */ - +/* defined in kernel header include/linux/namei.h */ #define INTENT_MAGIC 0x19620323 struct lustre_intent_data { int it_disposition; int it_status; __u64 it_lock_handle; - void *it_data; int it_lock_mode; - int it_int_flags; + int it_remote_lock_mode; + __u64 it_remote_lock_handle; + void *it_data; + + unsigned int it_lock_set:1; }; + struct lookup_intent { int it_magic; void (*it_op_release)(struct lookup_intent *); @@ -550,53 +241,13 @@ struct vfsmount { void *pwd; }; -/* semaphores */ -struct rw_semaphore { - int count; -}; - -/* semaphores */ -struct semaphore { - int count; -}; - -/* use the macro's argument to avoid unused warnings */ -#define down(a) do { (void)a; } while (0) -#define mutex_down(a) down(a) -#define up(a) do { (void)a; } while (0) -#define mutex_up(a) up(a) -#define down_read(a) do { (void)a; } while (0) -#define up_read(a) do { (void)a; } while (0) -#define down_write(a) do { (void)a; } while (0) -#define up_write(a) do { (void)a; } while (0) -#define sema_init(a,b) do { (void)a; } while (0) -#define init_rwsem(a) do { (void)a; } while (0) -#define DECLARE_MUTEX(name) \ - struct semaphore name = { 1 } -static inline void init_MUTEX (struct semaphore *sem) -{ - sema_init(sem, 1); -} -static inline void init_MUTEX_LOCKED (struct semaphore *sem) -{ - sema_init(sem, 0); -} - -#define init_mutex(s) init_MUTEX(s) - -typedef struct { - struct list_head sleepers; -} wait_queue_head_t; - -typedef struct { - struct list_head sleeping; - void *process; -} wait_queue_t; - struct signal { int signal; }; +#undef LL_TASK_CL_ENV +#define LL_TASK_CL_ENV cl_env + struct task_struct { int state; struct signal pending; @@ -609,43 +260,26 @@ struct task_struct { int max_groups; int ngroups; gid_t *groups; + void *cl_env; __u32 cap_effective; }; + typedef struct task_struct cfs_task_t; #define cfs_current() current #define cfs_curproc_pid() (current->pid) #define cfs_curproc_comm() (current->comm) +#define cfs_curproc_fsuid() (current->fsuid) +#define cfs_curproc_fsgid() (current->fsgid) +#define cfs_curproc_umask() ({ mode_t mask = umask(0); umask(mask); mask; }) extern struct task_struct *current; -int in_group_p(gid_t gid); -static inline int capable(int cap) -{ - if (current->cap_effective & (1 << cap)) - return 1; - else - return 0; -} +int cfs_curproc_is_in_groups(gid_t gid); -#define set_current_state(foo) do { current->state = foo; } while (0) - -#define init_waitqueue_entry(q,p) do { (q)->process = p; } while (0) -#define add_wait_queue(q,p) do { list_add(&(q)->sleepers, &(p)->sleeping); } while (0) -#define del_wait_queue(p) do { list_del(&(p)->sleeping); } while (0) -#define remove_wait_queue(q,p) do { list_del(&(p)->sleeping); } while (0) - -#define DECLARE_WAIT_QUEUE_HEAD(HEAD) \ - wait_queue_head_t HEAD = { \ - .sleepers = LIST_HEAD_INIT(HEAD.sleepers) \ - } -#define init_waitqueue_head(l) INIT_LIST_HEAD(&(l)->sleepers) -#define wake_up(l) do { int a; a++; } while (0) -#define TASK_INTERRUPTIBLE 0 -#define TASK_UNINTERRUPTIBLE 1 -#define TASK_RUNNING 2 - -#define wait_event_interruptible(wq, condition) \ -({ \ +#define cfs_set_current_state(foo) do { current->state = foo; } while (0) + +#define cfs_wait_event_interruptible(wq, condition, ret) \ +{ \ struct l_wait_info lwi; \ int timeout = 100000000;/* for ever */ \ int ret; \ @@ -654,29 +288,17 @@ static inline int capable(int cap) ret = l_wait_event(NULL, condition, &lwi); \ \ ret; \ -}) - -#define in_interrupt() (0) - -#define schedule() do {} while (0) -static inline int schedule_timeout(signed long t) -{ - return 0; } -#define lock_kernel() do {} while (0) -#define unlock_kernel() do {} while (0) #define daemonize(l) do {} while (0) #define sigfillset(l) do {} while (0) #define recalc_sigpending(l) do {} while (0) -#define kernel_thread(l,m,n) LBUG() #define USERMODEHELPER(path, argv, envp) (0) #define SIGNAL_MASK_ASSERT() -#define KERN_INFO +#define CFS_KERN_INFO -#include -#if HZ != 1 +#if CFS_HZ != 1 #error "liblustre's jiffies currently expects HZ to be 1" #endif #define jiffies \ @@ -688,52 +310,6 @@ static inline int schedule_timeout(signed long t) _ret; \ }) #define get_jiffies_64() (__u64)jiffies -#define time_after(a, b) ((long)(b) - (long)(a) < 0) -#define time_before(a, b) time_after(b,a) -#define time_after_eq(a,b) ((long)(a) - (long)(b) >= 0) - -struct timer_list { - struct list_head tl_list; - void (*function)(unsigned long unused); - unsigned long data; - long expires; -}; - -static inline int timer_pending(struct timer_list *l) -{ - if (time_after(l->expires, jiffies)) - return 1; - else - return 0; -} - -static inline int init_timer(struct timer_list *l) -{ - INIT_LIST_HEAD(&l->tl_list); - return 0; -} - -static inline void mod_timer(struct timer_list *l, int thetime) -{ - l->expires = thetime; -} - -static inline void del_timer(struct timer_list *l) -{ - free(l); -} - -typedef struct { volatile int counter; } atomic_t; - -#define ATOMIC_INIT(i) { (i) } -#define atomic_read(a) ((a)->counter) -#define atomic_set(a,b) do {(a)->counter = b; } while (0) -#define atomic_dec_and_test(a) ((--((a)->counter)) == 0) -#define atomic_dec_and_lock(a,b) ((--((a)->counter)) == 0) -#define atomic_inc(a) (((a)->counter)++) -#define atomic_dec(a) do { (a)->counter--; } while (0) -#define atomic_add(b,a) do {(a)->counter += b;} while (0) -#define atomic_sub(b,a) do {(a)->counter -= b;} while (0) #ifndef likely #define likely(exp) (exp) @@ -742,40 +318,10 @@ typedef struct { volatile int counter; } atomic_t; #define unlikely(exp) (exp) #endif -#define might_sleep() +#define cfs_might_sleep() #define might_sleep_if(c) #define smp_mb() -static inline -int test_and_set_bit(int nr, unsigned long *addr) -{ - int oldbit; - - while (nr >= sizeof(long)) { - nr -= sizeof(long); - addr++; - } - - oldbit = (*addr) & (1 << nr); - *addr |= (1 << nr); - return oldbit; -} - -static inline -int test_and_clear_bit(int nr, unsigned long *addr) -{ - int oldbit; - - while (nr >= sizeof(long)) { - nr -= sizeof(long); - addr++; - } - - oldbit = (*addr) & (1 << nr); - *addr &= ~(1 << nr); - return oldbit; -} - /* FIXME sys/capability will finally included linux/fs.h thus * cause numerous trouble on x86-64. as temporary solution for * build broken at Cray, we copy definition we need from capability.h @@ -794,46 +340,18 @@ typedef enum { CAP_SET=1 } cap_flag_value_t; -#define CAP_DAC_OVERRIDE 1 -#define CAP_DAC_READ_SEARCH 2 -#define CAP_FOWNER 3 -#define CAP_FSETID 4 -#define CAP_SYS_ADMIN 21 - cap_t cap_get_proc(void); int cap_get_flag(cap_t, cap_value_t, cap_flag_t, cap_flag_value_t *); -/* log related */ -static inline int llog_init_commit_master(void) { return 0; } -static inline int llog_cleanup_commit_master(int force) { return 0; } static inline void libcfs_run_lbug_upcall(char *file, const char *fn, const int l){} -/* completion */ -struct completion { - unsigned int done; - cfs_waitq_t wait; -}; - -#define COMPLETION_INITIALIZER(work) \ - { 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) } - -#define DECLARE_COMPLETION(work) \ - struct completion work = COMPLETION_INITIALIZER(work) - -#define INIT_COMPLETION(x) ((x).done = 0) - -static inline void init_completion(struct completion *x) -{ - x->done = 0; - init_waitqueue_head(&x->wait); -} struct liblustre_wait_callback { - struct list_head llwc_list; - const char *llwc_name; - int (*llwc_fn)(void *arg); - void *llwc_arg; + cfs_list_t llwc_list; + const char *llwc_name; + int (*llwc_fn)(void *arg); + void *llwc_arg; }; void *liblustre_register_wait_callback(const char *name, @@ -841,7 +359,7 @@ void *liblustre_register_wait_callback(const char *name, void liblustre_deregister_wait_callback(void *notifier); int liblustre_wait_event(int timeout); -void *liblustre_register_idle_callback(const char *name, +void *liblustre_register_idle_callback(const char *name, int (*fn)(void *arg), void *arg); void liblustre_deregister_idle_callback(void *notifier); void liblustre_wait_idle(void); @@ -853,10 +371,10 @@ struct nfs_lock_info { void *host; }; -typedef struct file_lock { - struct file_lock *fl_next; /* singly linked list for this inode */ - struct list_head fl_link; /* doubly linked list of all locks */ - struct list_head fl_block; /* circular list of blocked processes */ +struct file_lock { + struct file_lock *fl_next; /* singly linked list for this inode */ + cfs_list_t fl_link; /* doubly linked list of all locks */ + cfs_list_t fl_block; /* circular list of blocked processes */ void *fl_owner; unsigned int fl_pid; cfs_waitq_t fl_wait; @@ -876,22 +394,32 @@ typedef struct file_lock { union { struct nfs_lock_info nfs_fl; } fl_u; -} cfs_flock_t; +}; -#define cfs_flock_type(fl) ((fl)->fl_type) -#define cfs_flock_set_type(fl, type) do { (fl)->fl_type = (type); } while(0) -#define cfs_flock_pid(fl) ((fl)->fl_pid) -#define cfs_flock_set_pid(fl, pid) do { (fl)->fl_pid = (pid); } while(0) -#define cfs_flock_start(fl) ((fl)->fl_start) -#define cfs_flock_set_start(fl, start) do { (fl)->fl_start = (start); } while(0) -#define cfs_flock_end(fl) ((fl)->fl_end) -#define cfs_flock_set_end(fl, end) do { (fl)->fl_end = (end); } while(0) +#define flock_type(fl) ((fl)->fl_type) +#define flock_set_type(fl, type) do { (fl)->fl_type = (type); } while (0) +#define flock_pid(fl) ((fl)->fl_pid) +#define flock_set_pid(fl, pid) do { (fl)->fl_pid = (pid); } while (0) +#define flock_start(fl) ((fl)->fl_start) +#define flock_set_start(fl, st) do { (fl)->fl_start = (st); } while (0) +#define flock_end(fl) ((fl)->fl_end) +#define flock_set_end(fl, end) do { (fl)->fl_end = (end); } while (0) #ifndef OFFSET_MAX #define INT_LIMIT(x) (~((x)1 << (sizeof(x)*8 - 1))) #define OFFSET_MAX INT_LIMIT(loff_t) #endif +#define i_atime i_stbuf.st_atime +#define i_mtime i_stbuf.st_mtime +#define i_ctime i_stbuf.st_ctime +/* use i_size_read() i_size_write() to access i_stbuf.st_size */ +#define i_blocks i_stbuf.st_blocks +#define i_blksize i_stbuf.st_blksize +#define i_mode i_stbuf.st_mode +#define i_uid i_stbuf.st_uid +#define i_gid i_stbuf.st_gid + /* XXX: defined in kernel */ #define FL_POSIX 1 #define FL_SLEEP 128 @@ -901,32 +429,27 @@ typedef struct file_lock { #define NO_QUOTA 1 /* ACL */ -struct posix_acl_entry { - short e_tag; - unsigned short e_perm; - unsigned int e_id; -}; - -struct posix_acl { - atomic_t a_refcount; - unsigned int a_count; - struct posix_acl_entry a_entries[0]; -}; - typedef struct { __u16 e_tag; __u16 e_perm; __u32 e_id; -} xattr_acl_entry; +} posix_acl_xattr_entry; + +struct posix_acl { + cfs_atomic_t a_refcount; + unsigned int a_count; + posix_acl_xattr_entry a_entries[0]; +}; typedef struct { - __u32 a_version; - xattr_acl_entry a_entries[0]; -} xattr_acl_header; + __u32 a_version; + posix_acl_xattr_entry a_entries[0]; +} posix_acl_xattr_header; -static inline size_t xattr_acl_size(int count) +static inline size_t posix_acl_xattr_size(int count) { - return sizeof(xattr_acl_header) + count * sizeof(xattr_acl_entry); + return sizeof(posix_acl_xattr_header) + count * + sizeof(posix_acl_xattr_entry); } static inline @@ -935,6 +458,10 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) return NULL; } +/* The kernel version takes 3 arguments, so strip that off first. */ +#define posix_acl_from_xattr(a,b,c) posix_acl_from_xattr(b,c) +#define posix_acl_to_xattr(a,b,c) posix_acl_to_xattr(b,c) + static inline int posix_acl_valid(const struct posix_acl *acl) { @@ -946,6 +473,10 @@ void posix_acl_release(struct posix_acl *acl) { } +#if defined(LIBLUSTRE_POSIX_ACL) && !defined(CONFIG_FS_POSIX_ACL) +# define CONFIG_FS_POSIX_ACL 1 +#endif + #ifndef ENOTSUPP #define ENOTSUPP ENOTSUP #endif @@ -964,6 +495,12 @@ static inline void set_fs(mm_segment_t seg) { } +#define S_IRWXUGO (S_IRWXU|S_IRWXG|S_IRWXO) +#define S_IALLUGO (S_ISUID|S_ISGID|S_ISVTX|S_IRWXUGO) + +struct inode *igrab(struct inode *inode); +void iput(struct inode *inode); + #include #include #include @@ -971,60 +508,6 @@ static inline void set_fs(mm_segment_t seg) #include #include -/* Fast hashing routine for a long. - (C) 2002 William Lee Irwin III, IBM */ - -/* - * Knuth recommends primes in approximately golden ratio to the maximum - * integer representable by a machine word for multiplicative hashing. - * Chuck Lever verified the effectiveness of this technique: - * http://www.citi.umich.edu/techreports/reports/citi-tr-00-1.pdf - * - * These primes are chosen to be bit-sparse, that is operations on - * them can use shifts and additions instead of multiplications for - * machines where multiplications are slow. - */ -#if BITS_PER_LONG == 32 -/* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */ -#define GOLDEN_RATIO_PRIME 0x9e370001UL -#elif BITS_PER_LONG == 64 -/* 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 */ -#define GOLDEN_RATIO_PRIME 0x9e37fffffffc0001UL -#else -#error Define GOLDEN_RATIO_PRIME for your wordsize. -#endif - -static inline unsigned long hash_long(unsigned long val, unsigned int bits) -{ - unsigned long hash = val; - -#if BITS_PER_LONG == 64 - /* Sigh, gcc can't optimise this alone like it does for 32 bits. */ - unsigned long n = hash; - n <<= 18; - hash -= n; - n <<= 33; - hash -= n; - n <<= 3; - hash += n; - n <<= 3; - hash -= n; - n <<= 4; - hash += n; - n <<= 2; - hash += n; -#else - /* On some cpus multiply is faster, on others gcc will do shifts */ - hash *= GOLDEN_RATIO_PRIME; -#endif - - /* High bits are more random, so use them. */ - return hash >> (BITS_PER_LONG - bits); -} - -static inline unsigned long hash_ptr(void *ptr, unsigned int bits) -{ - return hash_long((unsigned long)ptr, bits); -} +/** @} liblustre */ #endif