summaryrefslogtreecommitdiffstats
path: root/libmount/src/context.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmount/src/context.c')
-rw-r--r--libmount/src/context.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c
index d9bda4375..c53a63954 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -214,7 +214,7 @@ static int context_init_paths(struct libmnt_context *cxt, int writable)
if (!writable)
return 0; /* only paths wanted */
if (mnt_context_is_nomtab(cxt))
- return 0; /* write mode overrided by mount -n */
+ return 0; /* write mode overridden by mount -n */
if (cxt->flags & MNT_FL_TABPATHS_CHECKED)
return 0;
@@ -349,7 +349,7 @@ int mnt_context_get_optsmode(struct libmnt_context *cxt)
* canonicalizes paths when searching in fstab and when preparing source and target paths
* for mount(2) syscall.
*
- * This fuction has an effect on the private (within context) fstab instance only
+ * This function has an effect on the private (within context) fstab instance only
* (see mnt_context_set_fstab()). If you want to use an external fstab then you
* need to manage your private struct libmnt_cache (see mnt_table_set_cache(fstab,
* NULL).
@@ -686,7 +686,7 @@ int mnt_context_is_loopdel(struct libmnt_context *cxt)
*
* The mount context uses private @fs by default. This function allows to
* overwrite the private @fs with an external instance. This function
- * increments @fs reference counter (and deincrement reference counter of the
+ * increments @fs reference counter (and decrement reference counter of the
* old fs).
*
* The @fs will be modified by mnt_context_set_{source,target,options,fstype}
@@ -766,7 +766,7 @@ void *mnt_context_get_mtab_userdata(struct libmnt_context *cxt)
* Note that libmount does not interpret "nofail" (MNT_MS_NOFAIL)
* mount option. The real return code is always returned, when
* the device does not exist then it's usually MNT_ERR_NOSOURCE
- * from libmount or ENOENT, ENOTDIR, ENOTBLK, ENXIO from moun(2).
+ * from libmount or ENOENT, ENOTDIR, ENOTBLK, ENXIO from mount(2).
*
* Returns: 0 on success, negative number in case of error.
*/
@@ -1191,7 +1191,7 @@ int mnt_context_set_tables_errcb(struct libmnt_context *cxt,
/**
* mnt_context_set_cache:
* @cxt: mount context
- * @cache: cache instance or nULL
+ * @cache: cache instance or NULL
*
* The mount context maintains a private struct libmnt_cache by default. This
* function allows to overwrite the private cache with an external instance.
@@ -1248,7 +1248,7 @@ struct libmnt_cache *mnt_context_get_cache(struct libmnt_context *cxt)
* mnt_context_set_passwd_cb:
* @cxt: mount context
* @get: callback to get password
- * @release: callback to release (delallocate) password
+ * @release: callback to release (deallocate) password
*
* Sets callbacks for encryption password (e.g encrypted loopdev). This
* function is deprecated (encrypted loops are no longer supported).
@@ -1275,7 +1275,7 @@ int mnt_context_set_passwd_cb(struct libmnt_context *cxt,
* interrupted by signal or signals have to be ignored when the lock is locked.
*
* The default behavior is to ignore all signals (except SIGALRM and
- * SIGTRAP for mtab udate) when the lock is locked. If this behavior
+ * SIGTRAP for mtab update) when the lock is locked. If this behavior
* is unacceptable, then use:
*
* lc = mnt_context_get_lock(cxt);
@@ -1349,7 +1349,7 @@ int mnt_context_set_mflags(struct libmnt_context *cxt, unsigned long flags)
* @cxt: mount context
* @flags: returns MS_* mount flags
*
- * Converts mount options string to MS_* flags and bitewise-OR the result with
+ * Converts mount options string to MS_* flags and bitwise-OR the result with
* the already defined flags (see mnt_context_set_mflags()).
*
* Returns: 0 on success, negative number in case of error.
@@ -1406,7 +1406,7 @@ int mnt_context_set_user_mflags(struct libmnt_context *cxt, unsigned long flags)
* @cxt: mount context
* @flags: returns mount flags
*
- * Converts mount options string to MNT_MS_* flags and bitewise-OR the result
+ * Converts mount options string to MNT_MS_* flags and bitwise-OR the result
* with the already defined flags (see mnt_context_set_user_mflags()).
*
* Returns: 0 on success, negative number in case of error.
@@ -2440,7 +2440,7 @@ static int test_mount(struct libmnt_test *ts, int argc, char *argv[])
}
if (argc == idx + 1)
- /* mount <mountpont>|<device> */
+ /* mount <mountpoint>|<device> */
mnt_context_set_target(cxt, argv[idx++]);
else if (argc == idx + 2) {
@@ -2500,7 +2500,7 @@ static int test_umount(struct libmnt_test *ts, int argc, char *argv[])
}
if (argc == idx + 1) {
- /* mount <mountpont>|<device> */
+ /* mount <mountpoint>|<device> */
mnt_context_set_target(cxt, argv[idx++]);
} else {
rc = -EINVAL;
@@ -2542,7 +2542,7 @@ static int test_flags(struct libmnt_test *ts, int argc, char *argv[])
}
if (argc == idx + 1)
- /* mount <mountpont>|<device> */
+ /* mount <mountpoint>|<device> */
mnt_context_set_target(cxt, argv[idx++]);
rc = mnt_context_prepare_mount(cxt);