summaryrefslogtreecommitdiffstats
path: root/api/src
diff options
context:
space:
mode:
Diffstat (limited to 'api/src')
-rw-r--r--api/src/glfs-fops.c6
-rw-r--r--api/src/glfs-handleops.c8
-rw-r--r--api/src/glfs-handles.h4
-rw-r--r--api/src/glfs-internal.h11
-rw-r--r--api/src/glfs-resolve.c4
-rw-r--r--api/src/glfs.c4
-rw-r--r--api/src/glfs.h12
7 files changed, 25 insertions, 24 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index 476120b58f0..870b287c2a7 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -52,7 +52,7 @@ glfs_mark_glfd_for_deletion (struct glfs_fd *glfd)
return 0;
}
-/* This function is usefull for all async fops. There is chance that glfd is
+/* This function is useful for all async fops. There is chance that glfd is
* closed before async fop is completed. When glfd is closed we change the
* state to GLFD_CLOSE.
*
@@ -539,7 +539,7 @@ pub_glfs_creat (struct glfs *fs, const char *path, int flags, mode_t mode)
/* This must be glfs_resolve() and NOT glfs_lresolve().
That is because open("name", O_CREAT) where "name"
is a danging symlink must create the dangling
- destinataion.
+ destination.
*/
retry:
ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
@@ -5299,7 +5299,7 @@ out:
* to be read by the applications.
*
* In case if the application registers a cbk function, that shall
- * be called by this routine incase of any event received.
+ * be called by this routine in case of any event received.
* The cbk fn is responsible for notifying the
* applications the way it desires for each event queued (for eg.,
* can raise a signal or broadcast a cond variable etc.)
diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c
index 97f5cdc8fed..e40adf04d3d 100644
--- a/api/src/glfs-handleops.c
+++ b/api/src/glfs-handleops.c
@@ -1946,7 +1946,7 @@ glfs_h_poll_cache_invalidation (struct glfs *fs,
up_inode_arg->flags = ca_data->flags;
up_inode_arg->expire_time_attr = ca_data->expire_time_attr;
- /* XXX: Update stat as well incase of UP_*_TIMES.
+ /* XXX: Update stat as well in case of UP_*_TIMES.
* This will be addressed as part of INODE_UPDATE */
if (ca_data->flags & GFAPI_INODE_UPDATE_FLAGS) {
glfs_iatt_to_stat (fs, &ca_data->stat, &up_inode_arg->buf);
@@ -2021,7 +2021,7 @@ void glfs_release_upcall (void *ptr)
/*
* This API is used to poll for upcall events stored in the upcall list.
- * Current users of this API is NFS-Ganesha. Incase of any event received, it
+ * Current users of this API is NFS-Ganesha. In case of any event received, it
* will be mapped appropriately into 'glfs_upcall' along with the handle object
* to be passed to NFS-Ganesha.
*
@@ -2163,13 +2163,13 @@ GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_h_poll_upcall, 3.7.16);
static gf_boolean_t log_upcall370 = _gf_true; /* log once */
-/* The old glfs_h_poll_upcall interface requires intimite knowledge of the
+/* The old glfs_h_poll_upcall interface requires intimate knowledge of the
* structures that are returned to the calling application. This is not
* recommended, as the returned structures need to returned correctly (handles
* closed, memory free'd with the unavailable GF_FREE(), and possibly more.)
*
* To the best of our knowledge, only NFS-Ganesha uses the upcall events
- * through gfapi. We keep this backwards compatability function around so that
+ * through gfapi. We keep this backwards compatibility function around so that
* applications using the existing implementation do not break.
*
* WARNING: this function will be removed in the future.
diff --git a/api/src/glfs-handles.h b/api/src/glfs-handles.h
index a5c6ff37043..4b336909b57 100644
--- a/api/src/glfs-handles.h
+++ b/api/src/glfs-handles.h
@@ -47,7 +47,7 @@
*
*/
-/* Values for valid falgs to be used when using XXXsetattr, to set multiple
+/* Values for valid flags to be used when using XXXsetattr, to set multiple
attribute values passed via the related stat structure.
*/
#define GFAPI_SET_ATTR_MODE 0x1
@@ -275,7 +275,7 @@ glfs_h_access (glfs_t *fs, glfs_object_t *object, int mask) __THROW
This API is used to poll for upcall events stored in the
upcall list. Current users of this API is NFS-Ganesha.
- Incase of any event received, it will be mapped appropriately
+ In case of any event received, it will be mapped appropriately
into 'glfs_upcall' along with the handle('glfs_object') to be
passed to NFS-Ganesha.
diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 4416b78650f..52048f4592d 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -170,11 +170,12 @@ struct glfs {
* progress */
xlator_t *next_subvol; /* Any new graph is put to
* next_subvol, the graph in
- * next_subvol can either be move to
- * mip_subvol (if any IO picks it up
- * for migration), or be detroyed (if
- * there is a new graph, and this was
- * never picked for migration) */
+ * next_subvol can either be moved
+ * to mip_subvol (if any IO picks it
+ * up for migration), or be
+ * destroyed (if there is a new
+ * graph, and this was never picked
+ * for migration) */
xlator_t *old_subvol;
char *oldvolfile;
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
index 5c500480239..4b764d94122 100644
--- a/api/src/glfs-resolve.c
+++ b/api/src/glfs-resolve.c
@@ -319,7 +319,7 @@ glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
* parent : output_dir
* component : "dir"
*
- * Incase of nameless lookup, both "." and ".." retained
+ * In case of nameless lookup, both "." and ".." retained
*/
if (strcmp (component, ".") == 0) {
@@ -987,7 +987,7 @@ priv_glfs_subvol_done (struct glfs *fs, xlator_t *subvol)
/* For decrementing subvol->wind ref count we need not check/wait for
* migration-in-progress flag.
* Also glfs_subvol_done is called in call-back path therefore waiting
- * fot migration-in-progress flag can lead to dead-lock.
+ * for migration-in-progress flag can lead to dead-lock.
*/
glfs_lock (fs, _gf_false);
{
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 545015fd58c..694e5e6f947 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -1231,7 +1231,7 @@ glusterfs_ctx_destroy (glusterfs_ctx_t *ctx)
/* Free all the graph structs and its containing xlator_t structs
* from this point there should be no reference to GF_FREE/GF_CALLOC
- * as it will try to access mem_acct and the below funtion would
+ * as it will try to access mem_acct and the below function would
* have freed the same.
*/
list_for_each_entry_safe (trav_graph, tmp, &ctx->graphs, list) {
@@ -1666,7 +1666,7 @@ pub_glfs_upcall_register (struct glfs *fs, uint32_t event_list,
goto out;
}
- /* incase other thread does unregister */
+ /* in case other thread does unregister */
pthread_mutex_lock (&fs->mutex);
{
if (event_list & GLFS_EVENT_INODE_INVALIDATE) {
diff --git a/api/src/glfs.h b/api/src/glfs.h
index b0f6605253a..3681cd11450 100644
--- a/api/src/glfs.h
+++ b/api/src/glfs.h
@@ -336,8 +336,8 @@ glfs_get_volfile (glfs_t *fs, void *buf, size_t len) __THROW
the management server (glusterd) to fetch volume uuid and stores it
in the glusterfs_context linked to the glfs object fs which can be used
in the subsequent calls. Later it parses that UUID to convert it from
- cannonical string format into an opaque byte array and copy it into
- the volid array. Incase if either of the input parameters, volid or size,
+ canonical string format into an opaque byte array and copy it into
+ the volid array. In case if either of the input parameters, volid or size,
is NULL, number of bytes required to copy the volume UUID is returned.
PARAMETERS
@@ -992,7 +992,7 @@ glfs_xreaddirplus_get_stat (glfs_xreaddirp_stat_t *xstat) __THROW
* GFAPI_XREADDIRP_HANDLE
* @ext: Dirent struture to copy the values to
* (though optional recommended to be allocated by application
- * esp., in multi-threaded environement)
+ * esp., in multi-threaded environment)
*
* OUTPUT:
* @res: to store the next dirent value. If NULL and return value is '0',
@@ -1151,7 +1151,7 @@ typedef void (*glfs_upcall_cbk) (glfs_upcall_t *up_arg, void *data);
* Current available values are:
* - GFAPI_UPCALL_INODE_INVALIDATE
*
- * @cbk: The cbk routine to be invoked incase of any upcall received
+ * @cbk: The cbk routine to be invoked in case of any upcall received
* @data: Any opaque pointer provided by caller which shall be using while
* making cbk calls. This pointer may be used by caller for any of its
* internal use while processing upcalls. Can be NULL.
@@ -1252,11 +1252,11 @@ typedef void (*glfs_recall_cbk) (glfs_lease_t lease, void *data);
@data: It is a cookie, this pointer is returned as a part of recall
fn and data field are stored as a part of glfs_fd, hence if there are multiple
- glfs_lease calls, each of them updates the fn and data fileds. glfs_recall_cbk
+ glfs_lease calls, each of them updates the fn and data fields. glfs_recall_cbk
will be invoked with the last updated fn and data
RETURN VALUES
- 0: Successfull completion
+ 0: Successful completion
<0: Failure. @errno will be set with the type of failure
*/