diff options
| author | Hou Tao <houtao1@huawei.com> | 2021-12-03 19:47:15 +0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-12-07 18:19:28 +0100 |
| commit | c7c15ae3dc50c0ab46c5cbbf8d2f3d3307e51f37 (patch) | |
| tree | 8138f654c9479aea88d32de06424c5f45dcda9a7 /drivers/nvme | |
| parent | 793fcab83f38661e22e6f7c682dfba6fd0d97bb2 (diff) | |
| download | linux-c7c15ae3dc50c0ab46c5cbbf8d2f3d3307e51f37.tar.bz2 | |
nvme-multipath: set ana_log_size to 0 after free ana_log_buf
Set ana_log_size to 0 when ana_log_buf is freed to make sure
nvme_mpath_init_identify will do the right thing when retrying
after an earlier failure.
Signed-off-by: Hou Tao <houtao1@huawei.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/multipath.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 7f2071f2460c..13e5d503ed07 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -866,7 +866,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) } if (ana_log_size > ctrl->ana_log_size) { nvme_mpath_stop(ctrl); - kfree(ctrl->ana_log_buf); + nvme_mpath_uninit(ctrl); ctrl->ana_log_buf = kmalloc(ana_log_size, GFP_KERNEL); if (!ctrl->ana_log_buf) return -ENOMEM; @@ -886,4 +886,5 @@ void nvme_mpath_uninit(struct nvme_ctrl *ctrl) { kfree(ctrl->ana_log_buf); ctrl->ana_log_buf = NULL; + ctrl->ana_log_size = 0; } |