Skip to content

Commit

Permalink
nvme-multipath: remove unused groups_only mode in ana log
Browse files Browse the repository at this point in the history
groups_only mode in nvme_read_ana_log() is no longer used: remove it.

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Anton Eidelman <anton@lightbitslabs.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Anton Eidelman authored and Jens Axboe committed Oct 29, 2019
1 parent af8fd04 commit 86cccfb
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/nvme/host/multipath.c
Original file line number Diff line number Diff line change
Expand Up @@ -522,14 +522,13 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
return 0;
}

static int nvme_read_ana_log(struct nvme_ctrl *ctrl, bool groups_only)
static int nvme_read_ana_log(struct nvme_ctrl *ctrl)
{
u32 nr_change_groups = 0;
int error;

mutex_lock(&ctrl->ana_lock);
error = nvme_get_log(ctrl, NVME_NSID_ALL, NVME_LOG_ANA,
groups_only ? NVME_ANA_LOG_RGO : 0,
error = nvme_get_log(ctrl, NVME_NSID_ALL, NVME_LOG_ANA, 0,
ctrl->ana_log_buf, ctrl->ana_log_size, 0);
if (error) {
dev_warn(ctrl->device, "Failed to get ANA log: %d\n", error);
Expand Down Expand Up @@ -565,7 +564,7 @@ static void nvme_ana_work(struct work_struct *work)
{
struct nvme_ctrl *ctrl = container_of(work, struct nvme_ctrl, ana_work);

nvme_read_ana_log(ctrl, false);
nvme_read_ana_log(ctrl);
}

static void nvme_anatt_timeout(struct timer_list *t)
Expand Down Expand Up @@ -715,7 +714,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
goto out;
}

error = nvme_read_ana_log(ctrl, false);
error = nvme_read_ana_log(ctrl);
if (error)
goto out_free_ana_log_buf;
return 0;
Expand Down

0 comments on commit 86cccfb

Please sign in to comment.