nvme: add proper discard setup for the multipath device

mainline inclusion
from mainline-v5.1-rc1
commit 26318571
category: bugfix
bugzilla: NA
CVE: NA
Link: https://gitee.com/openeuler/kernel/issues/I4JFBE?from=project-issue



-------------------------------------------------

Add a gendisk argument to nvme_config_discard so that the call to
nvme_update_disk_info for the multipath device node updates the
proper request_queue.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Tested-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

conflicts:
drivers/nvme/host/core.c
[adjust context]

Signed-off-by: chengjike <chengjike.cheng@huawei.com>
Reviewed-by: Ao Sun <sunao.sun@huawei.com>
Reviewed-by: Zhenwei Yang <yangzhenwei@huawei.com>
Reviewed-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>