Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-17 11:37:34 -08:00
parent 4594f16eb4 5ea99efac7
commit 06e7d7d2e5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libzpool/include/sys/zfs_context.h
View File

@ -315,11 +315,14 @@ typedef void (task_func_t)(void *);
#define TQ_NOSLEEP KM_NOSLEEP /* cannot block for memory; may fail */ #define TQ_NOSLEEP KM_NOSLEEP /* cannot block for memory; may fail */
#define TQ_NOQUEUE 0x02 /* Do not enqueue if can't dispatch */ #define TQ_NOQUEUE 0x02 /* Do not enqueue if can't dispatch */
extern taskq_t *system_taskq;
extern taskq_t *taskq_create(const char *, int, pri_t, int, int, uint_t); extern taskq_t *taskq_create(const char *, int, pri_t, int, int, uint_t);
extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t); extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
extern void taskq_destroy(taskq_t *); extern void taskq_destroy(taskq_t *);
extern void taskq_wait(taskq_t *); extern void taskq_wait(taskq_t *);
extern int taskq_member(taskq_t *, void *); extern int taskq_member(taskq_t *, void *);
extern void system_taskq_init(void);
#define XVA_MAPSIZE 3 #define XVA_MAPSIZE 3
#define XVA_MAGIC 0x78766174 #define XVA_MAGIC 0x78766174

12
lib/libzpool/util.c
View File

@ -41,24 +41,24 @@ void
nicenum(uint64_t num, char *buf) nicenum(uint64_t num, char *buf)
{ {
uint64_t n = num; uint64_t n = num;
int index = 0; int i = 0;
char u; char u;
while (n >= 1024) { while (n >= 1024) {
n = (n + (1024 / 2)) / 1024; /* Round up or down */ n = (n + (1024 / 2)) / 1024; /* Round up or down */
index++; i++;
} }
u = " KMGTPE"[index]; u = " KMGTPE"[i];
if (index == 0) { if (i == 0) {
(void) sprintf(buf, "%llu", (u_longlong_t)n); (void) sprintf(buf, "%llu", (u_longlong_t)n);
} else if (n < 10 && (num & (num - 1)) != 0) { } else if (n < 10 && (num & (num - 1)) != 0) {
(void) sprintf(buf, "%.2f%c", (void) sprintf(buf, "%.2f%c",
(double)num / (1ULL << 10 * index), u); (double)num / (1ULL << 10 * i), u);
} else if (n < 100 && (num & (num - 1)) != 0) { } else if (n < 100 && (num & (num - 1)) != 0) {
(void) sprintf(buf, "%.1f%c", (void) sprintf(buf, "%.1f%c",
(double)num / (1ULL << 10 * index), u); (double)num / (1ULL << 10 * i), u);
} else { } else {
(void) sprintf(buf, "%llu%c", (u_longlong_t)n, u); (void) sprintf(buf, "%llu%c", (u_longlong_t)n, u);
} }