c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 18:34:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 147509

Browse Source 
CID 147509: Explicit null dereferenced
- l2arc_sublist_lock is fragile as relied on caller too much.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: GeLiXin <ge.lixin@zte.com.cn>
Closes #5319
This commit is contained in:
GeLiXin 2016-11-01 07:04:01 +08:00 committed by Brian Behlendorf
parent 9f38f81ca3
commit 4aafab91c5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/zfs/arc.c
View File

@ -919,6 +919,12 @@ uint64_t zfs_crc64_table[256];
#define L2ARC_FEED_SECS 1 /* caching interval secs */ #define L2ARC_FEED_SECS 1 /* caching interval secs */
#define L2ARC_FEED_MIN_MS 200 /* min caching interval ms */ #define L2ARC_FEED_MIN_MS 200 /* min caching interval ms */
/*
* We can feed L2ARC from two states of ARC buffers, mru and mfu,
* and each of the state has two types: data and metadata.
*/
#define L2ARC_FEED_TYPES 4
#define l2arc_writes_sent ARCSTAT(arcstat_l2_writes_sent) #define l2arc_writes_sent ARCSTAT(arcstat_l2_writes_sent)
#define l2arc_writes_done ARCSTAT(arcstat_l2_writes_done) #define l2arc_writes_done ARCSTAT(arcstat_l2_writes_done)
@ -6965,7 +6971,7 @@ l2arc_sublist_lock(int list_num)
multilist_t *ml = NULL; multilist_t *ml = NULL;
unsigned int idx; unsigned int idx;
ASSERT(list_num >= 0 && list_num <= 3); ASSERT(list_num >= 0 && list_num < L2ARC_FEED_TYPES);
switch (list_num) { switch (list_num) {
case 0: case 0:
@ -6980,6 +6986,8 @@ l2arc_sublist_lock(int list_num)
case 3: case 3:
ml = &arc_mru->arcs_list[ARC_BUFC_DATA]; ml = &arc_mru->arcs_list[ARC_BUFC_DATA];
break; break;
default:
return (NULL);
} }
/* /*
@ -7138,10 +7146,12 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
/* /*
* Copy buffers for L2ARC writing. * Copy buffers for L2ARC writing.
*/ */
for (try = 0; try <= 3; try++) { for (try = 0; try < L2ARC_FEED_TYPES; try++) {
multilist_sublist_t *mls = l2arc_sublist_lock(try); multilist_sublist_t *mls = l2arc_sublist_lock(try);
uint64_t passed_sz = 0; uint64_t passed_sz = 0;
VERIFY3P(mls, !=, NULL);
/* /*
* L2ARC fast warmup. * L2ARC fast warmup.
* *