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
Fix kstat xuio
[zfs.git]
/
module
/
zfs
/
arc.c
diff --git
a/module/zfs/arc.c
b/module/zfs/arc.c
index
d6d648c
..
1d7fd9e
100644
(file)
--- a/
module/zfs/arc.c
+++ b/
module/zfs/arc.c
@@
-1143,6
+1143,8
@@
arc_space_consume(uint64_t space, arc_space_type_t type)
ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES);
switch (type) {
ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES);
switch (type) {
+ default:
+ break;
case ARC_SPACE_DATA:
ARCSTAT_INCR(arcstat_data_size, space);
break;
case ARC_SPACE_DATA:
ARCSTAT_INCR(arcstat_data_size, space);
break;
@@
-1167,6
+1169,8
@@
arc_space_return(uint64_t space, arc_space_type_t type)
ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES);
switch (type) {
ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES);
switch (type) {
+ default:
+ break;
case ARC_SPACE_DATA:
ARCSTAT_INCR(arcstat_data_size, -space);
break;
case ARC_SPACE_DATA:
ARCSTAT_INCR(arcstat_data_size, -space);
break;
@@
-1985,9
+1989,8
@@
arc_shrink(void)
static int
arc_reclaim_needed(void)
{
static int
arc_reclaim_needed(void)
{
- uint64_t extra;
-
#ifdef _KERNEL
#ifdef _KERNEL
+ uint64_t extra;
if (needfree)
return (1);
if (needfree)
return (1);
@@
-2675,7
+2678,7
@@
arc_read_nolock(zio_t *pio, spa_t *spa, const blkptr_t *bp,
uint32_t *arc_flags, const zbookmark_t *zb)
{
arc_buf_hdr_t *hdr;
uint32_t *arc_flags, const zbookmark_t *zb)
{
arc_buf_hdr_t *hdr;
- arc_buf_t *buf;
+ arc_buf_t *buf
= NULL
;
kmutex_t *hash_lock;
zio_t *rzio;
uint64_t guid = spa_guid(spa);
kmutex_t *hash_lock;
zio_t *rzio;
uint64_t guid = spa_guid(spa);
@@
-2757,7
+2760,7
@@
top:
uint64_t size = BP_GET_LSIZE(bp);
arc_callback_t *acb;
vdev_t *vd = NULL;
uint64_t size = BP_GET_LSIZE(bp);
arc_callback_t *acb;
vdev_t *vd = NULL;
-
uint64_t addr
;
+
daddr_t addr = -1
;
boolean_t devw = B_FALSE;
if (hdr == NULL) {
boolean_t devw = B_FALSE;
if (hdr == NULL) {
@@
-3035,7
+3038,7
@@
arc_release(arc_buf_t *buf, void *tag)
arc_buf_hdr_t *hdr;
kmutex_t *hash_lock = NULL;
l2arc_buf_hdr_t *l2hdr;
arc_buf_hdr_t *hdr;
kmutex_t *hash_lock = NULL;
l2arc_buf_hdr_t *l2hdr;
- uint64_t buf_size;
+ uint64_t buf_size
= 0
;
/*
* It would be nice to assert that if it's DMU metadata (level >
/*
* It would be nice to assert that if it's DMU metadata (level >
@@
-3410,7
+3413,7
@@
arc_tempreserve_space(uint64_t reserve, uint64_t txg)
* in order to compress/encrypt/etc the data. We therefor need to
* make sure that there is sufficient available memory for this.
*/
* in order to compress/encrypt/etc the data. We therefor need to
* make sure that there is sufficient available memory for this.
*/
- if (
error = arc_memory_throttle(reserve, anon_size, txg
))
+ if (
(error = arc_memory_throttle(reserve, anon_size, txg)
))
return (error);
/*
return (error);
/*
@@
-4059,7
+4062,7
@@
l2arc_read_done(zio_t *zio)
static list_t *
l2arc_list_locked(int list_num, kmutex_t **lock)
{
static list_t *
l2arc_list_locked(int list_num, kmutex_t **lock)
{
- list_t *list;
+ list_t *list
= NULL
;
ASSERT(list_num >= 0 && list_num <= 3);
ASSERT(list_num >= 0 && list_num <= 3);
@@
-4232,7
+4235,7
@@
l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
list_t *list;
uint64_t passed_sz, write_sz, buf_sz, headroom;
void *buf_data;
list_t *list;
uint64_t passed_sz, write_sz, buf_sz, headroom;
void *buf_data;
- kmutex_t *hash_lock, *list_lock;
+ kmutex_t *hash_lock, *list_lock
= NULL
;
boolean_t have_lock, full;
l2arc_write_callback_t *cb;
zio_t *pio, *wzio;
boolean_t have_lock, full;
l2arc_write_callback_t *cb;
zio_t *pio, *wzio;