From: "Matias Bjørling" <mb@lightnvm.io>
To: axboe@fb.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
javier@cnexlabs.com, igor.j.konopko@intel.com,
marcin.dziegielewski@intel.com,
"Javier González" <javier@javigon.com>,
"Matias Bjørling" <mb@lightnvm.io>
Subject: [GIT PULL 09/18] lightnvm: pblk: check for chunk size before allocating it
Date: Fri, 1 Jun 2018 15:04:23 +0200 [thread overview]
Message-ID: <20180601130432.30866-10-mb@lightnvm.io> (raw)
In-Reply-To: <20180601130432.30866-1-mb@lightnvm.io>
From: Javier González <javier@javigon.com>
Do the check for the chunk state after making sure that the chunk type
is supported.
Fixes: 32ef9412c114 ("lightnvm: pblk: implement get log report chunk")
Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
---
drivers/lightnvm/pblk-init.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index b52855f9336b..9e3a43346d4c 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -751,14 +751,14 @@ static int pblk_setup_line_meta_20(struct pblk *pblk, struct pblk_line *line,
chunk->cnlb = chunk_meta->cnlb;
chunk->wp = chunk_meta->wp;
- if (!(chunk->state & NVM_CHK_ST_OFFLINE))
- continue;
-
if (chunk->type & NVM_CHK_TP_SZ_SPEC) {
WARN_ONCE(1, "pblk: custom-sized chunks unsupported\n");
continue;
}
+ if (!(chunk->state & NVM_CHK_ST_OFFLINE))
+ continue;
+
set_bit(pos, line->blk_bitmap);
nr_bad_chks++;
}
--
2.11.0
next prev parent reply other threads:[~2018-06-01 13:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 13:04 [GIT PULL v2 00/18] lightnvm updates for 4.18 Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 01/18] lightnvm: pblk: fail gracefully on line alloc. failure Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 02/18] lightnvm: pblk: recheck for bad lines at runtime Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 03/18] lightnvm: pblk: check read lba on gc path Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 04/18] lightnvn: pblk: improve error msg on corrupted LBAs Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 05/18] lightnvm: pblk: warn in case of corrupted write buffer Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 06/18] lightnvm: pblk: return NVM_ error on failed submission Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 07/18] lightnvm: pblk: remove unnecessary indirection Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 08/18] lightnvm: pblk: remove unnecessary argument Matias Bjørling
2018-06-01 13:04 ` Matias Bjørling [this message]
2018-06-01 13:04 ` [GIT PULL 10/18] lightnvn: pass flag on graceful teardown to targets Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 11/18] lightnvm: pblk: remove dead function Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 12/18] lightnvm: pblk: rework write error recovery path Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 13/18] lightnvm: pblk: garbage collect lines with failed writes Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 14/18] lightnvm: pblk: fix smeta write error path Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 15/18] lightnvm: proper error handling for pblk_bio_add_pages Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 16/18] lightnvm: fix partial read error path Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 17/18] lightnvm: pblk: add possibility to set write buffer size manually Matias Bjørling
2018-06-01 13:04 ` [GIT PULL 18/18] lightnvm: pblk: remove unnecessary bio_get/put Matias Bjørling
2018-06-01 13:45 ` [GIT PULL v2 00/18] lightnvm updates for 4.18 Jens Axboe
2018-06-01 14:01 ` Matias Bjørling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180601130432.30866-10-mb@lightnvm.io \
--to=mb@lightnvm.io \
--cc=axboe@fb.com \
--cc=igor.j.konopko@intel.com \
--cc=javier@cnexlabs.com \
--cc=javier@javigon.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcin.dziegielewski@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox