Skip to content

Commit 1ddcb6c

Browse files
author
Herton R. Krzesinski
committed
Merge: Revert "nvme: warn about shared namespaces without CONFIG_NVME_MULTIPATH"
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1857 ## Summary of Changes Revert "nvme: warn about shared namespaces without CONFIG_NVME_MULTIPATH" Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2140810 Upstream Status: RHEL-only Conflicts: Merge differences due to other commits This commit added a warning message that functionality will be removed in upstream kernel version 6.0. Since we cannot remove this functionality until at least the next major release, and also since our kernel version numbering scheme is different than upstream, remove this message in RHEL. This reverts commit 3650f2c. Signed-off-by: Ewan D. Milne <emilne@redhat.com> Approved-by: Chris Leech <cleech@redhat.com> Approved-by: John B. Wyatt IV <jwyatt@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 0734cda + 4831fc4 commit 1ddcb6c

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

drivers/block/loop.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2063,7 +2063,6 @@ static void loop_remove(struct loop_device *lo)
20632063
/* Make this loop device unreachable from pathname. */
20642064
del_gendisk(lo->lo_disk);
20652065
blk_mq_free_tag_set(&lo->tag_set);
2066-
20672066
mutex_lock(&loop_ctl_mutex);
20682067
idr_remove(&loop_index_idr, lo->lo_number);
20692068
mutex_unlock(&loop_ctl_mutex);

drivers/nvme/host/core.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4132,14 +4132,6 @@ static int nvme_init_ns_head(struct nvme_ns *ns, struct nvme_ns_info *info)
41324132
info->nsid);
41334133
goto out_put_ns_head;
41344134
}
4135-
4136-
if (!multipath && !list_empty(&head->list)) {
4137-
dev_warn(ctrl->device,
4138-
"Found shared namespace %d, but multipathing not supported.\n",
4139-
info->nsid);
4140-
dev_warn_once(ctrl->device,
4141-
"Support for shared namespaces without CONFIG_NVME_MULTIPATH is deprecated and will be removed in Linux 6.0\n.");
4142-
}
41434135
}
41444136

41454137
list_add_tail_rcu(&ns->siblings, &head->list);

0 commit comments

Comments
 (0)