xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lightnvm: pblk: simplify meta. memory allocation

Browse Source 
smeta size will always be suitable for a kmalloc allocation. Simplify
the code and leave the vmalloc fallback only for emeta, where the pblk
configuration has an impact.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Javier González
2017-06-26 11:57:21 +02:00
committed by Jens Axboe
parent f9c101523d
commit f680f19aa6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/lightnvm/pblk-init.c
View File

@@ -355,9 +355,9 @@ static void pblk_line_meta_free(struct pblk *pblk)
kfree(l_mg->vsc_list);
for (i = 0; i < PBLK_DATA_LINES; i++) {
pblk_mfree(&l_mg->sline_meta[i], l_mg->smeta_alloc_type);
kfree(l_mg->sline_meta[i]);
pblk_mfree(l_mg->eline_meta[i]->buf, l_mg->emeta_alloc_type);
kfree(&l_mg->eline_meta[i]);
kfree(l_mg->eline_meta[i]);
}
kfree(pblk->lines);
@@ -550,7 +550,6 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
/* smeta is always small enough to fit on a kmalloc memory allocation,
* emeta depends on the number of LUNs allocated to the pblk instance
*/
l_mg->smeta_alloc_type = PBLK_KMALLOC_META;
for (i = 0; i < PBLK_DATA_LINES; i++) {
l_mg->sline_meta[i] = kmalloc(lm->smeta_len, GFP_KERNEL);
if (!l_mg->sline_meta[i])
@@ -604,12 +603,12 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
fail_free_emeta:
while (--i >= 0) {
vfree(l_mg->eline_meta[i]->buf);
kfree(&l_mg->eline_meta[i]);
kfree(l_mg->eline_meta[i]);
}
fail_free_smeta:
for (i = 0; i < PBLK_DATA_LINES; i++)
pblk_mfree(&l_mg->sline_meta[i], l_mg->smeta_alloc_type);
kfree(l_mg->sline_meta[i]);
return -ENOMEM;
}