X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fliblustre.h;h=93432b68f47a78d671dc4a5bc246b0dacd54a317;hb=472fe13982952c9ccad969a996c054f9cf643847;hp=7539c0a06be3f93177a73cceeb80de13e4613990;hpb=14c1444535f2474268741795fabcec8541741f31;p=fs%2Flustre-release.git diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h index 7539c0a..93432b6 100644 --- a/lustre/include/liblustre.h +++ b/lustre/include/liblustre.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,6 +41,13 @@ #ifndef LIBLUSTRE_H__ #define LIBLUSTRE_H__ +/** \defgroup liblustre liblustre + * + * @{ + */ +#include +#include + #ifdef __KERNEL__ #error Kernel files should not #include #endif @@ -54,14 +61,10 @@ #define loff_t long long #define ERESTART 2001 -typedef unsigned short umode_t; +typedef unsigned short cfs_umode_t; #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)) @@ -71,7 +74,7 @@ typedef unsigned short umode_t; /* * 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; @@ -86,17 +89,30 @@ void *inter_module_get(char *arg); static __inline__ int ext2_set_bit(int nr, void *addr) { - return set_bit(nr, addr); +#ifdef __BIG_ENDIAN + return cfs_set_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr); +#else + return cfs_set_bit(nr, addr); +#endif } static __inline__ int ext2_clear_bit(int nr, void *addr) { - return clear_bit(nr, addr); +#ifdef __BIG_ENDIAN + return cfs_clear_bit((nr ^ ((BITS_PER_LONG-1) & ~0x7)), addr); +#else + return cfs_clear_bit(nr, addr); +#endif } static __inline__ int ext2_test_bit(int nr, void *addr) { - return test_bit(nr, addr); +#ifdef __BIG_ENDIAN + __const__ unsigned char *tmp = (__const__ unsigned char *) addr; + return (tmp[nr >> 3] >> (nr & 7)) & 1; +#else + return cfs_test_bit(nr, addr); +#endif } @@ -115,14 +131,13 @@ extern int echo_client_init(void); /* general stuff */ -#define EXPORT_SYMBOL(S) - -struct rcu_head { }; - -typedef __u64 kdev_t; - +#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) \ @@ -139,16 +154,17 @@ typedef __u64 kdev_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 */ +#define cfs_num_physpages (256 * 1024) /* 1GB */ +#define CFS_NUM_CACHEPAGES cfs_num_physpages /* VFS stuff */ @@ -169,10 +185,11 @@ void get_random_bytes(void *ptr, int size); #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; @@ -182,21 +199,7 @@ 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 { @@ -205,7 +208,6 @@ struct lustre_intent_data { __u64 it_lock_handle; void *it_data; int it_lock_mode; - int it_int_flags; }; struct lookup_intent { int it_magic; @@ -238,6 +240,9 @@ struct signal { int signal; }; +#undef LL_TASK_CL_ENV +#define LL_TASK_CL_ENV cl_env + struct task_struct { int state; struct signal pending; @@ -250,6 +255,7 @@ struct task_struct { int max_groups; int ngroups; gid_t *groups; + void *cl_env; __u32 cap_effective; }; @@ -258,14 +264,16 @@ 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) extern struct task_struct *current; -int in_group_p(gid_t gid); +int cfs_curproc_is_in_groups(gid_t gid); -#define set_current_state(foo) do { current->state = foo; } while (0) +#define cfs_set_current_state(foo) do { current->state = foo; } while (0) -#define wait_event_interruptible(wq, condition) \ -({ \ +#define cfs_wait_event_interruptible(wq, condition, ret) \ +{ \ struct l_wait_info lwi; \ int timeout = 100000000;/* for ever */ \ int ret; \ @@ -274,20 +282,17 @@ int in_group_p(gid_t gid); ret = l_wait_event(NULL, condition, &lwi); \ \ ret; \ -}) +} -#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 -#if HZ != 1 +#if CFS_HZ != 1 #error "liblustre's jiffies currently expects HZ to be 1" #endif #define jiffies \ @@ -307,77 +312,10 @@ int in_group_p(gid_t gid); #define unlikely(exp) (exp) #endif -#define might_sleep() +#define cfs_might_sleep() #define might_sleep_if(c) #define smp_mb() -/** - * fls - find last (most-significant) bit set - * @x: the word to search - * - * This is defined the same way as ffs. - * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. - */ -static inline -int fls(int x) -{ - int r = 32; - - if (!x) - return 0; - if (!(x & 0xffff0000u)) { - x <<= 16; - r -= 16; - } - if (!(x & 0xff000000u)) { - x <<= 8; - r -= 8; - } - if (!(x & 0xf0000000u)) { - x <<= 4; - r -= 4; - } - if (!(x & 0xc0000000u)) { - x <<= 2; - r -= 2; - } - if (!(x & 0x80000000u)) { - x <<= 1; - r -= 1; - } - return r; -} - -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 @@ -404,10 +342,10 @@ static inline void libcfs_run_lbug_upcall(char *file, const char *fn, 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, @@ -415,7 +353,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); @@ -428,9 +366,9 @@ struct nfs_lock_info { }; 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 *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; @@ -466,41 +404,46 @@ typedef struct file_lock { #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 /* quota */ #define QUOTA_OK 0 -#define NO_QUOTA 1 +#define NO_QUOTA (-EDQUOT) /* 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 @@ -520,19 +463,8 @@ void posix_acl_release(struct posix_acl *acl) { } -#ifdef LIBLUSTRE_POSIX_ACL -# ifndef posix_acl_xattr_entry -# define posix_acl_xattr_entry xattr_acl_entry -# endif -# ifndef posix_acl_xattr_header -# define posix_acl_xattr_header xattr_acl_header -# endif -# ifndef posix_acl_xattr_size -# define posix_acl_xattr_size(entry) xattr_acl_size(entry) -# endif -# ifndef CONFIG_FS_POSIX_ACL -# define CONFIG_FS_POSIX_ACL 1 -# endif +#if defined(LIBLUSTRE_POSIX_ACL) && !defined(CONFIG_FS_POSIX_ACL) +# define CONFIG_FS_POSIX_ACL 1 #endif #ifndef ENOTSUPP @@ -553,6 +485,9 @@ 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) + #include #include #include @@ -560,4 +495,6 @@ static inline void set_fs(mm_segment_t seg) #include #include +/** @} liblustre */ + #endif