X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flibcfs_private.h;h=63b5b92cbff3e14e8209369d30aab622897bc190;hb=d39408943a56f452d68b3c8b170ee4ce10e416fa;hp=ee5f1da6c3bda606b6981d5f0376f8b372591009;hpb=4642f30970c8737f31d63c75eeda2cff15c68a77;p=fs%2Flustre-release.git diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h index ee5f1da..63b5b92 100644 --- a/libcfs/include/libcfs/libcfs_private.h +++ b/libcfs/include/libcfs/libcfs_private.h @@ -42,9 +42,6 @@ #ifndef __LIBCFS_PRIVATE_H__ #define __LIBCFS_PRIVATE_H__ -/* XXX this layering violation is for nidstrings */ -#include - #ifndef DEBUG_SUBSYSTEM # define DEBUG_SUBSYSTEM S_UNDEFINED #endif @@ -172,7 +169,6 @@ do { \ CERROR("LNET: %d total bytes allocated by lnet\n", \ libcfs_kmem_read()); \ } else { \ - memset((ptr), 0, (size)); \ libcfs_kmem_inc((ptr), (size)); \ CDEBUG(D_MALLOC, "alloc '" #ptr "': %d at %p (tot %d).\n", \ (int)(size), (ptr), libcfs_kmem_read()); \ @@ -181,12 +177,13 @@ do { \ /** * allocate memory with GFP flags @mask + * The allocated memory is zeroed-out. */ #define LIBCFS_ALLOC_GFP(ptr, size, mask) \ do { \ LIBCFS_ALLOC_PRE((size), (mask)); \ (ptr) = (size) <= LIBCFS_VMALLOC_SIZE ? \ - kmalloc((size), (mask)) : vmalloc(size); \ + kzalloc((size), (mask)) : vzalloc(size); \ LIBCFS_ALLOC_POST((ptr), (size)); \ } while (0) @@ -206,13 +203,14 @@ do { \ * allocate memory for specified CPU partition * \a cptab != NULL, \a cpt is CPU partition id of \a cptab * \a cptab == NULL, \a cpt is HW NUMA node id + * The allocated memory is zeroed-out. */ #define LIBCFS_CPT_ALLOC_GFP(ptr, cptab, cpt, size, mask) \ do { \ LIBCFS_ALLOC_PRE((size), (mask)); \ (ptr) = (size) <= LIBCFS_VMALLOC_SIZE ? \ - cfs_cpt_malloc((cptab), (cpt), (size), (mask)) : \ - cfs_cpt_vmalloc((cptab), (cpt), (size)); \ + cfs_cpt_malloc((cptab), (cpt), (size), (mask) | __GFP_ZERO) : \ + cfs_cpt_vzalloc((cptab), (cpt), (size)); \ LIBCFS_ALLOC_POST((ptr), (size)); \ } while (0) @@ -310,16 +308,13 @@ int libcfs_debug_cleanup(void); * build go below this comment. Actual compiler/compiler version * specific implementations come from the above header files */ -#ifdef __GNUC__ #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) -#else -#define likely(x) (!!(x)) -#define unlikely(x) (!!(x)) -#endif /* !__KERNEL__ */ #endif +struct cfs_cpt_table; + /* * allocate per-cpu-partition data, returned value is an array of pointers, * variable can be indexed by CPU ID. @@ -474,11 +469,7 @@ struct cfs_percpt_lock { }; /* return number of private locks */ -static inline int -cfs_percpt_lock_num(struct cfs_percpt_lock *pcl) -{ - return cfs_cpt_number(pcl->pcl_cptab); -} +#define cfs_percpt_lock_num(pcl) cfs_cpt_number(pcl->pcl_cptab) #else /* !__KERNEL__ */ @@ -534,46 +525,7 @@ int cfs_percpt_atomic_summary(atomic_t **refs); * value after conversion... * */ -#define CLASSERT(cond) do {switch(42) {case (cond): case 0: break;}} while (0) - -/* support decl needed both by kernel and liblustre */ -int libcfs_isknown_lnd(int type); -char *libcfs_lnd2modname(int type); -char *libcfs_lnd2str(int type); -int libcfs_str2lnd(const char *str); -char *libcfs_net2str(__u32 net); -char *libcfs_nid2str(lnet_nid_t nid); -__u32 libcfs_str2net(const char *str); -lnet_nid_t libcfs_str2nid(const char *str); -int libcfs_str2anynid(lnet_nid_t *nid, const char *str); -char *libcfs_id2str(lnet_process_id_t id); -void cfs_free_nidlist(struct list_head *list); -int cfs_parse_nidlist(char *str, int len, struct list_head *list); -int cfs_print_nidlist(char *buffer, int count, - struct list_head *list); -int cfs_match_nid(lnet_nid_t nid, struct list_head *list); -bool cfs_nidrange_is_contiguous(struct list_head *nidlist); -void cfs_nidrange_find_min_max(struct list_head *nidlist, - char *min_nid, char *max_nid, - int nidstr_length); - -/** \addtogroup lnet_addr - * @{ */ -/* how an LNET NID encodes net:address */ -/** extract the address part of an lnet_nid_t */ -#define LNET_NIDADDR(nid) ((__u32)((nid) & 0xffffffff)) -/** extract the network part of an lnet_nid_t */ -#define LNET_NIDNET(nid) ((__u32)(((nid) >> 32)) & 0xffffffff) -/** make an lnet_nid_t from a network part and an address part */ -#define LNET_MKNID(net,addr) ((((__u64)(net))<<32)|((__u64)(addr))) -/* how net encodes type:number */ -#define LNET_NETNUM(net) ((net) & 0xffff) -#define LNET_NETTYP(net) (((net) >> 16) & 0xffff) -#define LNET_MKNET(typ,num) ((((__u32)(typ))<<16)|((__u32)(num))) -/** @} lnet_addr */ - -/* max value for numeric network address */ -#define MAX_NUMERIC_VALUE 0xffffffff +#define CLASSERT(cond) do {switch (1) {case (cond): case 0: break; } } while (0) /* implication */ #define ergo(a, b) (!(a) || (b)) @@ -600,30 +552,30 @@ struct libcfs_device_userstate #define MKSTR(ptr) ((ptr))? (ptr) : "" -static inline int cfs_size_round4 (int val) +static inline size_t cfs_size_round4(size_t val) { return (val + 3) & (~0x3); } #ifndef HAVE_CFS_SIZE_ROUND -static inline int cfs_size_round (int val) +static inline size_t cfs_size_round(size_t val) { return (val + 7) & (~0x7); } #define HAVE_CFS_SIZE_ROUND #endif -static inline int cfs_size_round16(int val) +static inline size_t cfs_size_round16(size_t val) { return (val + 0xf) & (~0xf); } -static inline int cfs_size_round32(int val) +static inline size_t cfs_size_round32(size_t val) { return (val + 0x1f) & (~0x1f); } -static inline int cfs_size_round0(int val) +static inline size_t cfs_size_round0(size_t val) { if (!val) return 0; @@ -632,11 +584,11 @@ static inline int cfs_size_round0(int val) static inline size_t cfs_round_strlen(char *fset) { - return (size_t)cfs_size_round((int)strlen(fset) + 1); + return cfs_size_round(strlen(fset) + 1); } /* roundup \a val to power2 */ -static inline unsigned int cfs_power2_roundup(unsigned int val) +static inline size_t cfs_power2_roundup(size_t val) { if (val != LOWEST_BIT_SET(val)) { /* not a power of 2 already */ do { @@ -662,15 +614,6 @@ do { \ ptr += cfs_size_round(len); \ } while (0) -#define LOGL0(var,len,ptr) \ -do { \ - if (!len) \ - break; \ - memcpy((char *)ptr, (const char *)var, len); \ - *((char *)(ptr) + len) = 0; \ - ptr += cfs_size_round(len + 1); \ -} while (0) - /** * Lustre Network Driver types. */ @@ -693,4 +636,11 @@ enum { GNIIPLND = 14, }; +extern struct cfs_psdev_ops libcfs_psdev_ops; +extern struct miscdevice libcfs_dev; +extern struct cfs_wi_sched *cfs_sched_rehash; + +extern int insert_proc(void); +extern void remove_proc(void); + #endif