Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4992 llite: validate names
[fs/lustre-release.git]
/
libcfs
/
include
/
libcfs
/
libcfs_private.h
diff --git
a/libcfs/include/libcfs/libcfs_private.h
b/libcfs/include/libcfs/libcfs_private.h
index
bdc2215
..
45c4565
100644
(file)
--- a/
libcfs/include/libcfs/libcfs_private.h
+++ b/
libcfs/include/libcfs/libcfs_private.h
@@
-194,7
+194,7
@@
do { \
* default allocator
*/
#define LIBCFS_ALLOC(ptr, size) \
* default allocator
*/
#define LIBCFS_ALLOC(ptr, size) \
- LIBCFS_ALLOC_GFP(ptr, size,
__GFP_IO
)
+ LIBCFS_ALLOC_GFP(ptr, size,
GFP_NOFS
)
/**
* non-sleeping allocator
/**
* non-sleeping allocator
@@
-218,7
+218,7
@@
do { \
/** default numa allocator */
#define LIBCFS_CPT_ALLOC(ptr, cptab, cpt, size) \
/** default numa allocator */
#define LIBCFS_CPT_ALLOC(ptr, cptab, cpt, size) \
- LIBCFS_CPT_ALLOC_GFP(ptr, cptab, cpt, size,
__GFP_IO
)
+ LIBCFS_CPT_ALLOC_GFP(ptr, cptab, cpt, size,
GFP_NOFS
)
#define LIBCFS_FREE(ptr, size) \
do { \
#define LIBCFS_FREE(ptr, size) \
do { \
@@
-534,7
+534,7
@@
int cfs_percpt_atomic_summary(atomic_t **refs);
* value after conversion...
*
*/
* value after conversion...
*
*/
-#define CLASSERT(cond) do {switch
(42) {case (cond): case 0: break;}
} while (0)
+#define CLASSERT(cond) do {switch
(1) {case (cond): case 0: break; }
} while (0)
/* support decl needed both by kernel and liblustre */
int libcfs_isknown_lnd(int type);
/* support decl needed both by kernel and liblustre */
int libcfs_isknown_lnd(int type);
@@
-549,7
+549,13
@@
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);
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);
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
* @{ */
/** \addtogroup lnet_addr
* @{ */
@@
-656,15
+662,6
@@
do { \
ptr += cfs_size_round(len); \
} while (0)
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.
*/
/**
* Lustre Network Driver types.
*/
@@
-684,6
+681,7
@@
enum {
VIBLND = 11,
MXLND = 12,
GNILND = 13,
VIBLND = 11,
MXLND = 12,
GNILND = 13,
+ GNIIPLND = 14,
};
#endif
};
#endif