summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libglusterfs/src/client_t.c2
-rw-r--r--libglusterfs/src/common-utils.c2
-rw-r--r--libglusterfs/src/dict.h2
-rw-r--r--libglusterfs/src/fd-lk.c4
-rw-r--r--libglusterfs/src/fd.c2
-rw-r--r--libglusterfs/src/glusterfs.h2
-rw-r--r--libglusterfs/src/graph.y2
-rw-r--r--libglusterfs/src/run.h2
-rw-r--r--libglusterfs/src/syncop.h2
9 files changed, 10 insertions, 10 deletions
diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
index 6e09a372ea0..ada85b484bb 100644
--- a/libglusterfs/src/client_t.c
+++ b/libglusterfs/src/client_t.c
@@ -38,7 +38,7 @@ gf_client_chain_client_entries (cliententry_t *entries, uint32_t startidx,
for (i = startidx; i < (endcount - 1); i++)
entries[i].next_free = i + 1;
- /* i has already been incremented upto the last entry. */
+ /* i has already been incremented up to the last entry. */
entries[i].next_free = GF_CLIENTTABLE_END;
return 0;
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index be8bd6298ac..ec2f07ec994 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -1834,7 +1834,7 @@ out:
}
/* Matches all ipv4 address, if wildcard_acc is true '*' wildcard pattern for*
- subnets is considerd as valid strings as well */
+ subnets is considered as valid strings as well */
char
valid_ipv4_address (char *address, int length, gf_boolean_t wildcard_acc)
{
diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/dict.h
index a92fd2cb61a..7fd45e1cf34 100644
--- a/libglusterfs/src/dict.h
+++ b/libglusterfs/src/dict.h
@@ -122,7 +122,7 @@ void data_unref (data_t *data);
int32_t dict_lookup (dict_t *this, char *key, data_t **data);
/*
- TODO: provide converts for differnt byte sizes, signedness, and void *
+ TODO: provide converts for different byte sizes, signedness, and void *
*/
data_t *int_to_data (int64_t value);
data_t *str_to_data (char *value);
diff --git a/libglusterfs/src/fd-lk.c b/libglusterfs/src/fd-lk.c
index caf2bb38e51..3c1befea966 100644
--- a/libglusterfs/src/fd-lk.c
+++ b/libglusterfs/src/fd-lk.c
@@ -311,7 +311,7 @@ _fd_lk_sub_locks (struct _values *v,
v->locks[2]->fl_end);
} else if (small->fl_start == big->fl_start) {
/* One of the ends co-incide, break the
- locks into two seperate parts */
+ locks into two separate parts */
v->locks[0] = fd_lk_ctx_node_new (small->cmd, NULL);
if (!v->locks[0])
goto out;
@@ -327,7 +327,7 @@ _fd_lk_sub_locks (struct _values *v,
v->locks[1]->user_flock.l_start = small->fl_end + 1;
} else if (small->fl_end == big->fl_end) {
/* One of the ends co-incide, break the
- locks into two seperate parts */
+ locks into two separate parts */
v->locks[0] = fd_lk_ctx_node_new (small->cmd, NULL);
if (!v->locks[0])
goto out;
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index 2d50aa62e42..613f9017b0d 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -45,7 +45,7 @@ gf_fd_chain_fd_entries (fdentry_t *entries, uint32_t startidx,
for (i = startidx; i < (endcount - 1); i++)
entries[i].next_free = i + 1;
- /* i has already been incremented upto the last entry. */
+ /* i has already been incremented up to the last entry. */
entries[i].next_free = GF_FDTABLE_END;
return 0;
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index 4db601612bd..eb3d8963cab 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -160,7 +160,7 @@
#define DEFAULT_GLUSTERFSD_MISC_DIRETORY DATADIR "/lib/misc/glusterfsd"
#define GF_REPLICATE_TRASH_DIR ".landfill"
-/* GlusterFS's maximum supported Auxilary GIDs */
+/* GlusterFS's maximum supported Auxiliary GIDs */
/* TODO: Keeping it to 200, so that we can fit in 2KB buffer for auth data
* in RPC server code, if there is ever need for having more aux-gids, then
* we have to add aux-gid in payload of actors */
diff --git a/libglusterfs/src/graph.y b/libglusterfs/src/graph.y
index a220abeb9ce..42d638e5fd6 100644
--- a/libglusterfs/src/graph.y
+++ b/libglusterfs/src/graph.y
@@ -129,7 +129,7 @@ new_volume (char *name)
if (curr) {
gf_log ("parser", GF_LOG_ERROR,
- "new volume (%s) defintion in line %d unexpected",
+ "new volume (%s) definition in line %d unexpected",
name, graphyylineno);
ret = -1;
goto out;
diff --git a/libglusterfs/src/run.h b/libglusterfs/src/run.h
index d7554ef6d8c..1dc4bf9f1b0 100644
--- a/libglusterfs/src/run.h
+++ b/libglusterfs/src/run.h
@@ -118,7 +118,7 @@ runner_redir (runner_t *runner, int fd, int tgt_fd);
*
* @param runner pointer to runner_t instance
*
- * @return 0 on succesful spawn
+ * @return 0 on successful spawn
* -1 on failure (either due to earlier errors or execve(2) failing)
*
* @see runner_cout()
diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h
index 16f3833ba82..1a52af7833a 100644
--- a/libglusterfs/src/syncop.h
+++ b/libglusterfs/src/syncop.h
@@ -327,7 +327,7 @@ syncop_create_frame (xlator_t *this)
}
int synclock_init (synclock_t *lock);
-int synclock_destory (synclock_t *lock);
+int synclock_destroy (synclock_t *lock);
int synclock_lock (synclock_t *lock);
int synclock_trylock (synclock_t *lock);
int synclock_unlock (synclock_t *lock);