lkml.org 
[lkml]   [2019]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 62/68] nvme-multipath: relax ANA state check
    Date
    From: Martin George <marting@netapp.com>

    [ Upstream commit cc2278c413c3a06a93c23ee8722e4dd3d621de12 ]

    When undergoing state transitions I/O might be requeued, hence
    we should always call nvme_mpath_set_live() to schedule requeue_work
    whenever the nvme device is live, independent on whether the
    old state was live or not.

    Signed-off-by: Martin George <marting@netapp.com>
    Signed-off-by: Gargi Srinivas <sring@netapp.com>
    Signed-off-by: Hannes Reinecke <hare@suse.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
    ---
    drivers/nvme/host/multipath.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
    index da8f5ad30c71..260248fbb8fe 100644
    --- a/drivers/nvme/host/multipath.c
    +++ b/drivers/nvme/host/multipath.c
    @@ -349,15 +349,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)
    static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc,
    struct nvme_ns *ns)
    {
    - enum nvme_ana_state old;
    -
    mutex_lock(&ns->head->lock);
    - old = ns->ana_state;
    ns->ana_grpid = le32_to_cpu(desc->grpid);
    ns->ana_state = desc->state;
    clear_bit(NVME_NS_ANA_PENDING, &ns->flags);

    - if (nvme_state_is_live(ns->ana_state) && !nvme_state_is_live(old))
    + if (nvme_state_is_live(ns->ana_state))
    nvme_mpath_set_live(ns);
    mutex_unlock(&ns->head->lock);
    }
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-04-22 22:01    [W:4.390 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site