diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2024-06-04 23:44:40 +0300 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2024-06-04 23:44:40 +0300 |
| commit | 1a02c7a7a9257b597eabd0bc26e9a01697c23db7 (patch) | |
| tree | 48d680fec82e7b28f80098c988b11024a2c4fa2b /libmount/src | |
| parent | d7282ef8b3b030bbecee4264ae7674e0bf08d52c (diff) | |
| download | util-linux-1a02c7a7a9257b597eabd0bc26e9a01697c23db7.tar.gz | |
*: spelling and grammar fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Diffstat (limited to 'libmount/src')
| -rw-r--r-- | libmount/src/context.c | 4 | ||||
| -rw-r--r-- | libmount/src/context_mount.c | 2 | ||||
| -rw-r--r-- | libmount/src/context_umount.c | 2 | ||||
| -rw-r--r-- | libmount/src/hook_mount.c | 4 | ||||
| -rw-r--r-- | libmount/src/hook_mount_legacy.c | 2 | ||||
| -rw-r--r-- | libmount/src/hook_selinux.c | 2 | ||||
| -rw-r--r-- | libmount/src/hook_subdir.c | 2 | ||||
| -rw-r--r-- | libmount/src/hook_veritydev.c | 2 | ||||
| -rw-r--r-- | libmount/src/hooks.c | 2 | ||||
| -rw-r--r-- | libmount/src/lock.c | 2 | ||||
| -rw-r--r-- | libmount/src/mountP.h | 2 | ||||
| -rw-r--r-- | libmount/src/optlist.c | 6 | ||||
| -rw-r--r-- | libmount/src/optstr.c | 2 | ||||
| -rw-r--r-- | libmount/src/tab_update.c | 6 |
14 files changed, 20 insertions, 20 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c index c91b0148e1..d38e3671f6 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -1695,7 +1695,7 @@ struct libmnt_lock *mnt_context_get_lock(struct libmnt_context *cxt) * * Be careful if use MS_REC flag -- this is flags is generic for * all mask. In this case is better to use options string where - * mount options are independent and nothign is applied to all options. + * mount options are independent and nothing is applied to all options. * * Returns: 0 on success, negative number in case of error. */ @@ -2150,7 +2150,7 @@ int mnt_context_merge_mflags(struct libmnt_context *cxt) return -ENOMEM; /* TODO: optlist returns always flags as merged, so - * MNT_FL_MOUNTFLAGS_MERGED is unncessary anymore + * MNT_FL_MOUNTFLAGS_MERGED is unnecessary anymore */ cxt->flags |= MNT_FL_MOUNTFLAGS_MERGED; return mnt_optlist_merge_opts(ls); diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index 6762877330..a685acc161 100644 --- a/libmount/src/context_mount.c +++ b/libmount/src/context_mount.c @@ -1119,7 +1119,7 @@ int mnt_context_next_mount(struct libmnt_context *cxt, if (!cxt || !fs || !itr) return -EINVAL; - /* ingore --onlyonce, it's default behavior for --all */ + /* ignore --onlyonce, it's default behavior for --all */ mnt_context_enable_onlyonce(cxt, 0); rc = mnt_context_get_fstab(cxt, &fstab); diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index adfaf7fa6b..c22ffbd80b 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -347,7 +347,7 @@ static int lookup_umount_fs_by_mountinfo(struct libmnt_context *cxt, const char return 0; } -/* This function searchs for FS according to cxt->fs->target, +/* This function searches for FS according to cxt->fs->target, * apply result to cxt->fs and it's umount replacement to * mnt_context_apply_fstab(), use mnt_context_tab_applied() * to check result. diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c index cd57bdbcbc..995de61444 100644 --- a/libmount/src/hook_mount.c +++ b/libmount/src/hook_mount.c @@ -603,7 +603,7 @@ static int init_sysapi(struct libmnt_context *cxt, /* C) FS based operation * - * Note, fstype is optinal and may be specified later if mount by + * Note, fstype is optional and may be specified later if mount by * list of FS types (mount -t foo,bar,ext4). In this case fsopen() * is called later in hook_create_mount(). */ } else { @@ -698,7 +698,7 @@ static int hook_prepare(struct libmnt_context *cxt, if (!ol) return -ENOMEM; - /* classic MS_* flags (include oprations like MS_REMOUNT, etc) */ + /* classic MS_* flags (include operations like MS_REMOUNT, etc) */ rc = mnt_optlist_get_flags(ol, &flags, cxt->map_linux, 0); /* MOUNT_ATTR_* flags for mount_setattr() */ diff --git a/libmount/src/hook_mount_legacy.c b/libmount/src/hook_mount_legacy.c index df3a691e0d..18b7a00663 100644 --- a/libmount/src/hook_mount_legacy.c +++ b/libmount/src/hook_mount_legacy.c @@ -261,7 +261,7 @@ static int hook_prepare(struct libmnt_context *cxt, assert(hs == &hookset_mount_legacy); #ifdef USE_LIBMOUNT_MOUNTFD_SUPPORT - /* do nothing when a new __mount succesfully registred */ + /* do nothing when a new __mount successfully registered */ if (mnt_context_has_hook(cxt, &hookset_mount, 0, NULL)) return 0; #endif diff --git a/libmount/src/hook_selinux.c b/libmount/src/hook_selinux.c index d6bae95c94..11d950c44e 100644 --- a/libmount/src/hook_selinux.c +++ b/libmount/src/hook_selinux.c @@ -157,7 +157,7 @@ static int hook_prepare_options( char *raw = NULL; /* @target placeholder is replaced later when target - * is already avalable. The mountpoint does not have to exist + * is already available. The mountpoint does not have to exist * yet (for example "-o X-mount.mkdir=" or --target-prefix). */ if (strcmp(opt_name, "rootcontext") == 0 && diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c index 99c30e1738..1ccf7b520c 100644 --- a/libmount/src/hook_subdir.c +++ b/libmount/src/hook_subdir.c @@ -208,7 +208,7 @@ static int do_mount_subdir( if (!rc) { /* Note that the original parental namespace could be * private, in this case, it will not see our final mount, - * so we need to move the the orignal namespace. + * so we need to move the the original namespace. */ setns(hsd->old_ns_fd, CLONE_NEWNS); diff --git a/libmount/src/hook_veritydev.c b/libmount/src/hook_veritydev.c index 6a9e64469a..5bb58d0903 100644 --- a/libmount/src/hook_veritydev.c +++ b/libmount/src/hook_veritydev.c @@ -26,7 +26,7 @@ #ifdef CRYPTSETUP_VIA_DLOPEN # include <dlfcn.h> -/* Pointers to libcryptsetup functions (initiliazed by dlsym()) */ +/* Pointers to libcryptsetup functions (initialized by dlsym()) */ struct verity_opers { void (*crypt_set_debug_level)(int); void (*crypt_set_log_callback)(struct crypt_device *, void (*log)(int, const char *, void *), void *); diff --git a/libmount/src/hooks.c b/libmount/src/hooks.c index dcfe69fa4d..85c7475d37 100644 --- a/libmount/src/hooks.c +++ b/libmount/src/hooks.c @@ -23,7 +23,7 @@ * hooksets with more callbacks in more stages. Usually implemented by * locally defined 'struct hookset_data' in hook_*.c. * - * - per-hook data; acessible for specific callback + * - per-hook data; accessible for specific callback * Usually implemented by locally defined 'struct hook_data' in hook_*.c. */ #include "mountP.h" diff --git a/libmount/src/lock.c b/libmount/src/lock.c index 8aca8a7768..b336a3b5da 100644 --- a/libmount/src/lock.c +++ b/libmount/src/lock.c @@ -15,7 +15,7 @@ * @title: Locking * @short_description: locking methods for utab or another libmount files * - * Since v2.39 libmount does nto support classic mtab locking. Now all is based + * Since v2.39 libmount does not support classic mtab locking. Now all is based * on flock only. * */ diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h index b855a90b39..ed5f2ec29f 100644 --- a/libmount/src/mountP.h +++ b/libmount/src/mountP.h @@ -413,7 +413,7 @@ struct libmnt_context const struct libmnt_optmap *map_linux; /* system options map */ const struct libmnt_optmap *map_userspace; /* userspace options map */ - const char *mountinfo_path; /* usualy /proc/self/moutinfo */ + const char *mountinfo_path; /* usually /proc/self/moutinfo */ const char *utab_path; /* path to utab */ int utab_writable; /* is utab writable */ diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c index e324896273..317d7a39d2 100644 --- a/libmount/src/optlist.c +++ b/libmount/src/optlist.c @@ -139,7 +139,7 @@ int mnt_optlist_register_map(struct libmnt_optlist *ls, const struct libmnt_optm for (i = 0; i < ls->nmaps; i++) { if (ls->maps[i] == map) - return 0; /* already registred, ignore */ + return 0; /* already registered, ignore */ } if (ls->nmaps + 1 >= MNT_OL_MAXMAPS) return -ERANGE; @@ -849,7 +849,7 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl * specified (except atime stuff). For backward compatibility we need * to emulate this semantic by mount_setattr(). The new * mount_setattr() has simple set/unset sematinc and nothing is - * internally in kernel reseted. + * reset internally in kernel. */ if (mnt_optlist_is_remount(ls) && !mnt_optlist_is_bind(ls) @@ -946,7 +946,7 @@ int mnt_optlist_strdup_optstr(struct libmnt_optlist *ls, char **optstr, *optstr = NULL; - /* For generic options srings ro/rw is expected at the begining */ + /* For generic options strings ro/rw are expected at the beginning */ if ((!map || map == ls->linux_map) && (what == MNT_OL_FLTR_DFLT || what == MNT_OL_FLTR_ALL || diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c index 7ebc29555b..30cd1af616 100644 --- a/libmount/src/optstr.c +++ b/libmount/src/optstr.c @@ -582,7 +582,7 @@ int mnt_optstr_get_options(const char *optstr, char **subset, * @wanted: options expected in @optstr * @missing: returns options from @wanted which missing in @optstr (optional) * - * Retursn: <0 on error, 0 on missing options, 1 if nothing is missing + * Returns: <0 on error, 0 on missing options, 1 if nothing is missing */ int mnt_optstr_get_missing(const char *optstr, const char *wanted, char **missing) { diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c index d44d190bc9..fa07dc0d9f 100644 --- a/libmount/src/tab_update.c +++ b/libmount/src/tab_update.c @@ -939,7 +939,7 @@ int mnt_update_table(struct libmnt_update *upd, struct libmnt_lock *lc) else if (upd->mountflags & MS_REMOUNT) rc = update_modify_options(upd); /* remount */ else if (upd->fs && upd->missing_options) - rc = update_add_options(upd); /* mount by externel helper */ + rc = update_add_options(upd); /* mount by external helper */ else if (upd->fs) rc = update_add_entry(upd); /* mount */ @@ -977,7 +977,7 @@ int mnt_update_already_done(struct libmnt_update *upd) DBG(UPDATE, ul_debugobj(upd, "%s: found %s %s", upd->filename, src, tgt)); - /* Check if utab entry (probably writen by /sbin/mount.<type> + /* Check if utab entry (probably written by /sbin/mount.<type> * helper) contains all options expected by this update */ if (mnt_optstr_get_missing(fs->user_optstr, upd->fs->user_optstr, NULL) == 0) { upd->missing_options = 1; @@ -1052,7 +1052,7 @@ int mnt_update_start(struct libmnt_update *upd) asprintf(&upd->act_filename, "%s.act", upd->filename) <= 0) return -ENOMEM; - /* Use exclusive lock to avoid some other proces will remove the the + /* Use exclusive lock to avoid some other process will remove the the * file before it's marked as used by LOCK_SH (below) */ rc = update_init_lock(upd, NULL); if (rc) |