From a4e5e71ee903f90a9c15ec88d172cf8d55d05f1d Mon Sep 17 00:00:00 2001 From: Julianne Swinoga Date: Wed, 18 Oct 2023 16:36:14 -0400 Subject: [PATCH] Fix minor spelling errors across project Signed-off-by: Julianne Swinoga --- CHANGELOG.md | 4 ++-- src/cgroup_legacy.c | 8 ++++---- src/dxcore.h | 4 ++-- src/nvc.c | 2 +- src/nvc_container.c | 2 +- src/nvc_info.c | 4 ++-- src/nvc_mount.c | 4 ++-- src/utils.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 397d7b01..f4a9e134 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,8 @@ * Generate debian and RPM changelogs automatically. ## 1.14.0~rc.2 -* Include Shared Compiler Library (`libnvidia-gpucomp.so``) in the list of compute libaries. +* Include Shared Compiler Library (`libnvidia-gpucomp.so``) in the list of compute libraries. ## 1.14.0~rc.1 -* Remove `linvidia-container0`` dependency on Ubuntu-based arm64 platforms +* Remove `libnvidia-container0`` dependency on Ubuntu-based arm64 platforms * Support OpenSSL 3 with the Encrypt/Decrypt library diff --git a/src/cgroup_legacy.c b/src/cgroup_legacy.c index 7035e978..3f7994ef 100644 --- a/src/cgroup_legacy.c +++ b/src/cgroup_legacy.c @@ -80,7 +80,7 @@ setup_device_cgroup(struct error *err, const struct nvc_container *cnt, dev_t id return (-1); log_infof("whitelisting device node %u:%u", major(id), minor(id)); - /* XXX dprintf doesn't seem to catch the write errors, flush the stream explicitly instead. */ + /* XXX fprintf doesn't seem to catch the write errors, flush the stream explicitly instead. */ if (fprintf(fs, "c %u:%u rw", major(id), minor(id)) < 0 || fflush(fs) == EOF || ferror(fs)) { error_set(err, "write error: %s", path); goto fail; @@ -124,15 +124,15 @@ cgroup_mount(char *line, char *prefix, const char *subsys) static char * cgroup_root(char *line, char *prefix, const char *subsys) { - char *heirarchy_id, *controller_list, *cgroup_path; + char *hierarchy_id, *controller_list, *cgroup_path; // From: https://man7.org/linux/man-pages/man7/cgroups.7.html // The lines of the /proc/{pid}/cgroup file have the following format: // hierarchy-ID:controller-list:cgroup-path // Here we attempt to parse the separate sections. If this is not // possible, we return NULL - heirarchy_id = strsep(&line, ":"); - if (heirarchy_id == NULL) { + hierarchy_id = strsep(&line, ":"); + if (hierarchy_id == NULL) { // line contained no colons return (NULL); } diff --git a/src/dxcore.h b/src/dxcore.h index 9c044fee..54be2caa 100644 --- a/src/dxcore.h +++ b/src/dxcore.h @@ -5,7 +5,7 @@ #ifndef HEADER_DXCORE_H_ #define HEADER_DXCORE_H_ -#define MAX_DXCORE_DRIVERSTORE_LIBRAIRIES (16) +#define MAX_DXCORE_DRIVERSTORE_LIBRARIES (16) struct dxcore_luid { @@ -19,7 +19,7 @@ struct dxcore_adapter unsigned int wddmVersion; char* pDriverStorePath; unsigned int driverStoreComponentCount; - const char* pDriverStoreComponents[MAX_DXCORE_DRIVERSTORE_LIBRAIRIES]; + const char* pDriverStoreComponents[MAX_DXCORE_DRIVERSTORE_LIBRARIES]; struct dxcore_context *pContext; }; diff --git a/src/nvc.c b/src/nvc.c index b220db81..42171ed7 100644 --- a/src/nvc.c +++ b/src/nvc.c @@ -213,7 +213,7 @@ mig_nvcaps_mknodes(struct error *err, int num_gpus) { continue; // Call into nvidia-modprobe code to perform the mknod() on - // /dev/nvidia-caps/nvidia-cap from the canonial + // /dev/nvidia-caps/nvidia-cap from the canonical // /proc path we constructed. log_infof("running mknod for " NV_CAPS_DEVICE_PATH " from %s", mig_minor, path); if (nvidia_cap_mknod(path, &mig_minor) == 0) { diff --git a/src/nvc_container.c b/src/nvc_container.c index 806ab20f..ec2eda26 100644 --- a/src/nvc_container.c +++ b/src/nvc_container.c @@ -165,7 +165,7 @@ copy_config(struct error *err, struct nvc_container *cnt, const struct nvc_conta libs_dir = USR_LIB_DIR; if (libs32_dir == NULL) { /* - * The lib32 directory is inconsistent accross distributions. + * The lib32 directory is inconsistent across distributions. * Check which one is used in the rootfs. */ libs32_dir = USR_LIB32_DIR; diff --git a/src/nvc_info.c b/src/nvc_info.c index 2d203ae9..f8c9c8b2 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c @@ -62,7 +62,7 @@ static const char * const utility_bins[] = { "nvidia-smi", /* System management interface */ "nvidia-debugdump", /* GPU coredump utility */ "nvidia-persistenced", /* Persistence mode utility */ - "nv-fabricmanager", /* NVSwitch fabrimanager utility */ + "nv-fabricmanager", /* NVSwitch fabric manager utility */ //"nvidia-modprobe", /* Kernel module loader */ //"nvidia-settings", /* X server settings */ //"nvidia-xconfig", /* X xorg.conf editor */ @@ -656,7 +656,7 @@ fill_mig_device_info(struct nvc_context *ctx, bool mig_enabled, struct driver_de if (xasprintf(&ctx->err, &info->devices[i].ci_caps_path, NV_COMP_INST_CAPS_PATH, minor(device->node.id), info->devices[i].gi, info->devices[i].ci) < 0) goto fail; - // If we made it to here, update the total count of MIG dervices by 1 + // If we made it to here, update the total count of MIG devices by 1 info->ndevices++; } diff --git a/src/nvc_mount.c b/src/nvc_mount.c index 83543712..34356817 100644 --- a/src/nvc_mount.c +++ b/src/nvc_mount.c @@ -71,7 +71,7 @@ mount_firmware(struct error *err, const char *root, const struct nvc_container * return mount_with_flags(err, src, dst, cnt->uid, cnt->gid, MS_RDONLY|MS_NODEV|MS_NOSUID); } -// mount_with_flags bind mounts the specified src to the the specified dst with the specified mount flags +// mount_with_flags bind mounts the specified src to the specified dst with the specified mount flags static char * mount_with_flags(struct error *err, const char *src, const char *dst, uid_t uid, uid_t gid, unsigned long mountflags) { mode_t mode; @@ -491,7 +491,7 @@ mount_procfs_mig(struct error *err, const char *root, const struct nvc_container if (xmount(err, NULL, dst, NULL, MS_BIND|MS_REMOUNT | MS_RDONLY|MS_NODEV|MS_NOSUID|MS_NOEXEC, NULL) < 0) goto fail; - // Copy the destinationpath out to a newly allocated string and return it. + // Copy the destination path out to a newly allocated string and return it. if ((mnt = xstrdup(err, dst)) == NULL) goto fail; diff --git a/src/utils.c b/src/utils.c index 8ff6f269..ed1fc582 100644 --- a/src/utils.c +++ b/src/utils.c @@ -526,7 +526,7 @@ file_create(struct error *err, const char *path, const char *data, uid_t uid, gi // We check whether the file already exists with the required mode and skip the creation. if (data == NULL && file_mode(err, path, &perm) == 0) { if (perm == mode) { - log_errf("The path %s alreay exists with the required mode; skipping create", path); + log_errf("The path %s already exists with the required mode; skipping create", path); return (0); } }