git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 3.6 compat, sget()
[zfs.git]
/
lib
/
libzpool
/
util.c
diff --git
a/lib/libzpool/util.c
b/lib/libzpool/util.c
index
781edb6
..
231043d
100644
(file)
--- a/
lib/libzpool/util.c
+++ b/
lib/libzpool/util.c
@@
-19,8
+19,7
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <assert.h>
*/
#include <assert.h>
@@
-90,7
+89,7
@@
show_vdev_stats(const char *desc, const char *ctype, nvlist_t *nv, int indent)
if (is_log)
prefix = "log ";
if (is_log)
prefix = "log ";
- if (nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_STATS,
+ if (nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_
VDEV_
STATS,
(uint64_t **)&vs, &c) != 0)
vs = &v0;
(uint64_t **)&vs, &c) != 0)
vs = &v0;
@@
-109,7
+108,7
@@
show_vdev_stats(const char *desc, const char *ctype, nvlist_t *nv, int indent)
(void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n",
indent, "",
prefix,
(void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n",
indent, "",
prefix,
-
indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12
),
+
(int)(indent+strlen(prefix)-25-(vs->vs_space ? 0 : 12)
),
desc,
vs->vs_space ? 6 : 0, vs->vs_space ? used : "",
vs->vs_space ? 6 : 0, vs->vs_space ? avail : "",
desc,
vs->vs_space ? 6 : 0, vs->vs_space ? used : "",
vs->vs_space ? 6 : 0, vs->vs_space ? avail : "",