Date: Sat, 6 Jun 2020 06:21:16 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361866 - head/sys/cam/nvme Message-ID: <202006060621.0566LGxY037158@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat Jun 6 06:21:15 2020 New Revision: 361866 URL: https://svnweb.freebsd.org/changeset/base/361866 Log: Add a tunable for the nvd symlink creation. Some automation tries to detect if nvd or nda is in used, and the presence of both confuses it. Provide a knob to turn off nvd alias creation (kern.cam.nda.nvd_compat=0) for these situations. The default is the same: create the nvd compat link. Modified: head/sys/cam/nvme/nvme_da.c Modified: head/sys/cam/nvme/nvme_da.c ============================================================================== --- head/sys/cam/nvme/nvme_da.c Sat Jun 6 06:20:04 2020 (r361865) +++ head/sys/cam/nvme/nvme_da.c Sat Jun 6 06:21:15 2020 (r361866) @@ -185,11 +185,14 @@ static int nda_send_ordered = NDA_DEFAULT_SEND_ORDERED static int nda_default_timeout = NDA_DEFAULT_TIMEOUT; static int nda_max_trim_entries = NDA_MAX_TRIM_ENTRIES; static int nda_enable_biospeedup = 1; +static int nda_nvd_compat = 1; SYSCTL_INT(_kern_cam_nda, OID_AUTO, max_trim, CTLFLAG_RDTUN, &nda_max_trim_entries, NDA_MAX_TRIM_ENTRIES, "Maximum number of BIO_DELETE to send down as a DSM TRIM."); SYSCTL_INT(_kern_cam_nda, OID_AUTO, enable_biospeedup, CTLFLAG_RDTUN, - &nda_enable_biospeedup, 0, "Enable BIO_SPEEDUP processing"); + &nda_enable_biospeedup, 0, "Enable BIO_SPEEDUP processing."); +SYSCTL_INT(_kern_cam_nda, OID_AUTO, nvd_compat, CTLFLAG_RDTUN, + &nda_nvd_compat, 1, "Enable creation of nvd aliases."); /* * All NVMe media is non-rotational, so all nvme device instances @@ -950,7 +953,8 @@ ndaregister(struct cam_periph *periph, void *arg) /* * Add alias for older nvd drives to ease transition. */ - disk_add_alias(disk, "nvd"); + if (nda_nvd_compat) + disk_add_alias(disk, "nvd"); /* * Acquire a reference to the periph before we register with GEOM.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006060621.0566LGxY037158>