summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/src/cli-cmd-volume.c4
-rw-r--r--cli/src/cli-rpc-ops.c14
-rw-r--r--doc/admin-guide/en-US/markdown/glossary.md2
-rw-r--r--doc/authentication.txt6
-rw-r--r--doc/coding-standard.tex2
-rw-r--r--doc/glusterfs.82
-rw-r--r--doc/hacker-guide/en-US/markdown/afr.md2
-rw-r--r--doc/hacker-guide/en-US/markdown/coding-standard.md2
-rw-r--r--doc/hacker-guide/en-US/markdown/unittest.md4
-rw-r--r--doc/hacker-guide/en-US/markdown/write-behind.md6
-rw-r--r--doc/legacy/errno.list.linux.txt2
-rw-r--r--doc/legacy/errno.list.macosx.txt2
-rw-r--r--doc/legacy/hacker-guide/call-stub.txt2
-rw-r--r--doc/legacy/hacker-guide/replicate.txt2
-rw-r--r--doc/legacy/replicate.lyx2
-rw-r--r--doc/legacy/solaris-related-xattrs.txt2
-rw-r--r--doc/legacy/user-guide.info10
-rw-r--r--doc/legacy/user-guide.texi10
-rwxr-xr-xextras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh2
19 files changed, 39 insertions, 39 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 8d80aaeb3cc..e334ddc8443 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -992,7 +992,7 @@ cli_cmd_volume_add_brick_cbk (struct cli_state *state,
}
/* TODO: there are challenges in supporting changing of
- stripe-count, untill it is properly supported give warning to user */
+ stripe-count, until it is properly supported give warning to user */
if (dict_get (options, "stripe-count")) {
answer = cli_cmd_get_confirmation (state, question);
@@ -1450,7 +1450,7 @@ cli_cmd_quota_cbk (struct cli_state *state, struct cli_cmd_word *word,
goto out;
}
- //create auxillary mount need for quota commands that operate on path
+ //create auxiliary mount need for quota commands that operate on path
ret = cli_stage_quota_op (volname, type);
if (ret)
goto out;
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index bef70357ae3..239a29ba831 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1686,7 +1686,7 @@ gf_cli_set_volume_cbk (struct rpc_req *req, struct iovec *iov,
ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len, &dict);
/* For brick processes graph change does not happen on the fly.
- * The proces has to be restarted. So this is a check from the
+ * The process has to be restarted. So this is a check from the
* volume set option such that if debug xlators such as trace/errorgen
* are provided in the set command, warn the user.
*/
@@ -4201,7 +4201,7 @@ write_contents_to_common_pem_file (dict_t *dict, int output_count)
char common_pem_file[PATH_MAX] = "";
char *output = NULL;
char output_name[PATH_MAX] = "";
- int bytes_writen = 0;
+ int bytes_written = 0;
int fd = -1;
int ret = -1;
int i = -1;
@@ -4239,16 +4239,16 @@ write_contents_to_common_pem_file (dict_t *dict, int output_count)
cli_out ("Unable to fetch output.");
}
if (output) {
- bytes_writen = write (fd, output, strlen(output));
- if (bytes_writen != strlen(output)) {
+ bytes_written = write (fd, output, strlen(output));
+ if (bytes_written != strlen(output)) {
gf_log ("", GF_LOG_ERROR, "Failed to write "
"to %s", common_pem_file);
ret = -1;
goto out;
}
/* Adding the new line character */
- bytes_writen = write (fd, "\n", strlen("\n"));
- if (bytes_writen != strlen("\n")) {
+ bytes_written = write (fd, "\n", strlen("\n"));
+ if (bytes_written != strlen("\n")) {
gf_log ("", GF_LOG_ERROR,
"Failed to add new line char");
ret = -1;
@@ -6621,7 +6621,7 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
if (ret)
continue;
- /* Brick/not-brick is handled seperately here as all
+ /* Brick/not-brick is handled separately here as all
* types of nodes are contained in the default output
*/
memset (status.brick, 0, PATH_MAX + 255);
diff --git a/doc/admin-guide/en-US/markdown/glossary.md b/doc/admin-guide/en-US/markdown/glossary.md
index 0203319b08a..d047622a93b 100644
--- a/doc/admin-guide/en-US/markdown/glossary.md
+++ b/doc/admin-guide/en-US/markdown/glossary.md
@@ -169,7 +169,7 @@ Glossary
**Translator**
: Translators (also called xlators) are stackable modules where each
module has a very specific purpose. Translators are stacked in a
- hierarchical structure called as graph. A translator recieves data
+ hierarchical structure called as graph. A translator receives data
from its parent translator, performs necessary operations and then
passes the data down to its child translator in hierarchy.
diff --git a/doc/authentication.txt b/doc/authentication.txt
index 73cb21d73ba..036a9df9908 100644
--- a/doc/authentication.txt
+++ b/doc/authentication.txt
@@ -15,11 +15,11 @@
----------------------------------------------------------------------------------------------------
* options provided in protocol/server:
* for username/password based authentication:
- option auth.login.<brick>.allow [comma seperated list of usernames using which clients can connect to volume <brick>]
+ option auth.login.<brick>.allow [comma separated list of usernames using which clients can connect to volume <brick>]
option auth.login.<username>.password <password> #specify password <password> for username <username>
* for addr based authentication:
- option auth.addr.<brick>.allow [comma seperated list of ip-addresses/unix-paths from which clients are allowed to connect to volume <brick>]
- option auth.addr.<brick>.reject [comma seperated list of ip-addresses/unix-paths from which clients are not allowed to connect to volume <brick>]
+ option auth.addr.<brick>.allow [comma separated list of ip-addresses/unix-paths from which clients are allowed to connect to volume <brick>]
+ option auth.addr.<brick>.reject [comma separated list of ip-addresses/unix-paths from which clients are not allowed to connect to volume <brick>]
* negation operator '!' is used to invert the sense of matching.
Eg., option auth.addr.brick.allow !a.b.c.d #do not allow client from a.b.c.d to connect to volume brick
option auth.addr.brick.reject !w.x.y.z #allow client from w.x.y.z to connect to volume brick
diff --git a/doc/coding-standard.tex b/doc/coding-standard.tex
index 30d412a918b..80c11041e60 100644
--- a/doc/coding-standard.tex
+++ b/doc/coding-standard.tex
@@ -321,7 +321,7 @@ This is the recommended template for any fop. In the beginning come
the initializations. After that, the `success' control flow should be
linear. Any error conditions should cause a \texttt{goto} to a single
point, \texttt{out}. At that point, the code should detect the error
-that has occured and do appropriate cleanup.
+that has occurred and do appropriate cleanup.
\begin{verbatim}
int32_t
diff --git a/doc/glusterfs.8 b/doc/glusterfs.8
index 60ad5709b95..fc28ef68be6 100644
--- a/doc/glusterfs.8
+++ b/doc/glusterfs.8
@@ -122,7 +122,7 @@ Dump fuse traffic to PATH
Set entry timeout to SECONDS in fuse kernel module (the default is 1).
.TP
\fB\-\-gid\-timeout=SECONDS\fR
-Set auxilary group list timeout to SECONDS for fuse translator (the default is 0).
+Set auxiliary group list timeout to SECONDS for fuse translator (the default is 0).
.TP
\fB\-\-negative\-timeout=SECONDS\fR
Set negative timeout to SECONDS in fuse kernel module (the default is 0).
diff --git a/doc/hacker-guide/en-US/markdown/afr.md b/doc/hacker-guide/en-US/markdown/afr.md
index 1be7e39f25f..566573a4e26 100644
--- a/doc/hacker-guide/en-US/markdown/afr.md
+++ b/doc/hacker-guide/en-US/markdown/afr.md
@@ -143,7 +143,7 @@ Self heal
* consider the entry with the highest `AFR_METADATA_PENDING` number as
definitive and replicate its attributes on children.
* If entry is a directory:
- * Consider the entry with the higest `AFR_ENTRY_PENDING` number as
+ * Consider the entry with the highest `AFR_ENTRY_PENDING` number as
definitive and replicate its contents on all children.
* If any two entries have non-matching types (i.e., one is file and
other is directory):
diff --git a/doc/hacker-guide/en-US/markdown/coding-standard.md b/doc/hacker-guide/en-US/markdown/coding-standard.md
index 178dc142ae3..368c5553464 100644
--- a/doc/hacker-guide/en-US/markdown/coding-standard.md
+++ b/doc/hacker-guide/en-US/markdown/coding-standard.md
@@ -341,7 +341,7 @@ This is the recommended template for any fop. In the beginning come
the initializations. After that, the `success' control flow should be
linear. Any error conditions should cause a `goto` to a single
point, `out`. At that point, the code should detect the error
-that has occured and do appropriate cleanup.
+that has occurred and do appropriate cleanup.
```
int32_t
diff --git a/doc/hacker-guide/en-US/markdown/unittest.md b/doc/hacker-guide/en-US/markdown/unittest.md
index 65e8b85d55c..73fe775d450 100644
--- a/doc/hacker-guide/en-US/markdown/unittest.md
+++ b/doc/hacker-guide/en-US/markdown/unittest.md
@@ -115,7 +115,7 @@ Add the following to your C file:
#include <assert.h>
/*
- * Checks caller responsability against contract
+ * Checks caller responsibility against contract
*/
#define REQUIRE(cond) assert(cond)
@@ -127,7 +127,7 @@ Add the following to your C file:
/*
* While REQUIRE and ENSURE apply to functions, INVARIANT
* applies to classes/structs. It ensures that intances
- * of the class/struct are consistant. In other words,
+ * of the class/struct are consistent. In other words,
* that the instance has not been corrupted.
*/
#define INVARIANT(invariant_fnc) do{ (invariant_fnc) } while (0);
diff --git a/doc/hacker-guide/en-US/markdown/write-behind.md b/doc/hacker-guide/en-US/markdown/write-behind.md
index e20682249e8..0d78964fa20 100644
--- a/doc/hacker-guide/en-US/markdown/write-behind.md
+++ b/doc/hacker-guide/en-US/markdown/write-behind.md
@@ -12,7 +12,7 @@ On a regular translator tree without write-behind, control flow is like this:
1. application makes a `write()` system call.
2. VFS ==> FUSE ==> `/dev/fuse`.
3. fuse-bridge initiates a glusterfs `writev()` call.
-4. `writev()` is `STACK_WIND()`ed upto client-protocol or storage translator.
+4. `writev()` is `STACK_WIND()`ed up to client-protocol or storage translator.
5. client-protocol, on receiving reply from server, starts `STACK_UNWIND()` towards the fuse-bridge.
On a translator tree with write-behind, control flow is like this:
@@ -20,7 +20,7 @@ On a translator tree with write-behind, control flow is like this:
1. application makes a `write()` system call.
2. VFS ==> FUSE ==> `/dev/fuse`.
3. fuse-bridge initiates a glusterfs `writev()` call.
-4. `writev()` is `STACK_WIND()`ed upto write-behind translator.
+4. `writev()` is `STACK_WIND()`ed up to write-behind translator.
5. write-behind adds the write buffer to its internal queue and does a `STACK_UNWIND()` towards the fuse-bridge.
write call is completed in application's percepective. after
@@ -46,7 +46,7 @@ writev() calls from fuse-bridge. Blocking is only from application's
perspective. Write-behind does `STACK_WIND()` to child translator
straight-away, but hold behind the `STACK_UNWIND()` towards fuse-bridge.
`STACK_UNWIND()` is done only once write-behind gets enough replies to
-accomodate for currently blocked request.
+accommodate for currently blocked request.
Flush behind
------------
diff --git a/doc/legacy/errno.list.linux.txt b/doc/legacy/errno.list.linux.txt
index cc868644b36..3f3b18c46ec 100644
--- a/doc/legacy/errno.list.linux.txt
+++ b/doc/legacy/errno.list.linux.txt
@@ -1273,7 +1273,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
#define APR_STATUS_IS_EHOSTUNREACH(s) ((s) == APR_EHOSTUNREACH)
/** network is unreachable */
#define APR_STATUS_IS_ENETUNREACH(s) ((s) == APR_ENETUNREACH)
-/** inappropiate file type or format */
+/** inappropriate file type or format */
#define APR_STATUS_IS_EFTYPE(s) ((s) == APR_EFTYPE)
/** broken pipe */
#define APR_STATUS_IS_EPIPE(s) ((s) == APR_EPIPE)
diff --git a/doc/legacy/errno.list.macosx.txt b/doc/legacy/errno.list.macosx.txt
index 4954e03d855..2dff28cd379 100644
--- a/doc/legacy/errno.list.macosx.txt
+++ b/doc/legacy/errno.list.macosx.txt
@@ -1212,7 +1212,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
#define APR_STATUS_IS_EHOSTUNREACH(s) ((s) == APR_EHOSTUNREACH)
/** network is unreachable */
#define APR_STATUS_IS_ENETUNREACH(s) ((s) == APR_ENETUNREACH)
-/** inappropiate file type or format */
+/** inappropriate file type or format */
#define APR_STATUS_IS_EFTYPE(s) ((s) == APR_EFTYPE)
/** broken pipe */
#define APR_STATUS_IS_EPIPE(s) ((s) == APR_EPIPE)
diff --git a/doc/legacy/hacker-guide/call-stub.txt b/doc/legacy/hacker-guide/call-stub.txt
index 021037a3512..cab8e4d552e 100644
--- a/doc/legacy/hacker-guide/call-stub.txt
+++ b/doc/legacy/hacker-guide/call-stub.txt
@@ -1,6 +1,6 @@
creating a call stub and pausing a call
---------------------------------------
-libglusterfs provides seperate API to pause each of the fop. parameters to each API is
+libglusterfs provides separate API to pause each of the fop. parameters to each API is
@frame - call frame which has to be used to resume the call at call_resume().
@fn - procedure to call during call_resume().
NOTE: @fn should exactly take the same type and number of parameters that
diff --git a/doc/legacy/hacker-guide/replicate.txt b/doc/legacy/hacker-guide/replicate.txt
index 133c72afa91..ad5b352a829 100644
--- a/doc/legacy/hacker-guide/replicate.txt
+++ b/doc/legacy/hacker-guide/replicate.txt
@@ -148,7 +148,7 @@ Each of the four major groups has its own algorithm:
definitive and replicate its attributes on children.
- If entry is a directory:
- - Consider the entry with the higest AFR_ENTRY_PENDING number as
+ - Consider the entry with the highest AFR_ENTRY_PENDING number as
definitive and replicate its contents on all children.
- If any two entries have non-matching types (i.e., one is file and
diff --git a/doc/legacy/replicate.lyx b/doc/legacy/replicate.lyx
index 58ba6b2e00e..e3d081191e0 100644
--- a/doc/legacy/replicate.lyx
+++ b/doc/legacy/replicate.lyx
@@ -293,7 +293,7 @@ Locking and Change Log
To ensure consistency across subvolumes, replicate holds a lock whenever a modificatio
n is being made to a file or directory.
By default, replicate considers the first subvolume as the sole lock server.
- However, the number of lock servers can be increased upto the total number
+ However, the number of lock servers can be increased up to the total number
of subvolumes.
\end_layout
diff --git a/doc/legacy/solaris-related-xattrs.txt b/doc/legacy/solaris-related-xattrs.txt
index 3a4643948c0..fa41e29000b 100644
--- a/doc/legacy/solaris-related-xattrs.txt
+++ b/doc/legacy/solaris-related-xattrs.txt
@@ -9,7 +9,7 @@ the leveraging of existing file system interface functionality to
support the construction, deletion and manipulation of attributes.
But as we have tested through this functionality provided by Solaris
-we have come accross two major issues as written below.
+we have come across two major issues as written below.
1. Symlink XATTR_NOFOLLOW not present for creating extended attributes
directly on the symlinks like other platforms Linux,MAC-OSX,BSD etc.
diff --git a/doc/legacy/user-guide.info b/doc/legacy/user-guide.info
index 2bbadb35107..eae0ef10b58 100644
--- a/doc/legacy/user-guide.info
+++ b/doc/legacy/user-guide.info
@@ -234,7 +234,7 @@ recommended that all users use the patched FUSE.
GlusterFS has been increased to 1MB, permitting large reads and
writes to be sent in bigger chunks.
- * The kernel's read-ahead boundry has been extended upto 1MB.
+ * The kernel's read-ahead boundary has been extended up to 1MB.
* Block size returned in the `stat()'/`fstat()' calls tuned to 1MB,
to make cp and similar commands perform I/O using that block size.
@@ -527,7 +527,7 @@ module loaded. You can ensure this by running:
[root@server]# modprobe fuse
Before we can run the GlusterFS client or server programs, we need
-to write two files called _volume specifications_ (equivalently refered
+to write two files called _volume specifications_ (equivalently referred
to as _volfiles_). The volfile describes the _translator tree_ on a
node. The next chapter will explain the concepts of `translator' and
`volume specification' in detail. For now, just assume that the volfile
@@ -1161,7 +1161,7 @@ alu.order' configuration directive.
Each sub-scheduler needs to know two things: when to kick in (the
entry-threshold), and how long to stay in control (the exit-threshold).
For example: when unifying three disks of 100GB, keeping an exact
-balance of disk-usage is not necesary. Instead, there could be a 1GB
+balance of disk-usage is not necessary. Instead, there could be a 1GB
margin, which can be used to nicely balance other factors, such as
read-usage. The disk-usage scheduler can be told to kick in only when a
certain threshold of discrepancy is passed, such as 1GB. When it
@@ -1557,7 +1557,7 @@ can be pipelined. This mode of write-behind operation is best used on
the client side, to enable decreased write latency for the application.
The write-behind translator can also aggregate write requests. If the
-`aggregate-size' option is specified, then successive writes upto that
+`aggregate-size' option is specified, then successive writes up to that
size are accumulated and written in a single operation. This mode of
operation is best used on the server side, as this will decrease the
disk's head movement when multiple files are being written to in
@@ -1611,7 +1611,7 @@ useful in a web hosting environment, where most clients will simply
read some files and only a few will write to them).
The IO cache translator reads data from its child in `page-size'
-chunks. It caches data upto `cache-size' bytes. The cache is
+chunks. It caches data up to `cache-size' bytes. The cache is
maintained as a prioritized least-recently-used (LRU) list, with
priorities determined by user-specified patterns to match filenames.
diff --git a/doc/legacy/user-guide.texi b/doc/legacy/user-guide.texi
index 8e429853ffd..31ff9cf304e 100644
--- a/doc/legacy/user-guide.texi
+++ b/doc/legacy/user-guide.texi
@@ -260,7 +260,7 @@ The specific changes made to @acronym{FUSE} are:
@itemize
@item The communication channel size between @acronym{FUSE} kernel module and GlusterFS has been increased to 1MB, permitting large reads and writes to be sent in bigger chunks.
-@item The kernel's read-ahead boundry has been extended upto 1MB.
+@item The kernel's read-ahead boundary has been extended up to 1MB.
@item Block size returned in the @command{stat()}/@command{fstat()} calls tuned to 1MB, to make cp and similar commands perform I/O using that block size.
@@ -554,7 +554,7 @@ can ensure this by running:
@end example
Before we can run the GlusterFS client or server programs, we need to write
-two files called @emph{volume specifications} (equivalently refered to as @emph{volfiles}).
+two files called @emph{volume specifications} (equivalently referred to as @emph{volfiles}).
The volfile describes the @emph{translator tree} on a node. The next chapter will
explain the concepts of `translator' and `volume specification' in detail. For now,
just assume that the volfile is like an NFS @command{/etc/export} file.
@@ -1198,7 +1198,7 @@ and in which order to evaluate them. This is done through the
Each sub-scheduler needs to know two things: when to kick in (the
entry-threshold), and how long to stay in control (the
exit-threshold). For example: when unifying three disks of 100GB,
-keeping an exact balance of disk-usage is not necesary. Instead, there
+keeping an exact balance of disk-usage is not necessary. Instead, there
could be a 1GB margin, which can be used to nicely balance other
factors, such as read-usage. The disk-usage scheduler can be told to
kick in only when a certain threshold of discrepancy is passed, such
@@ -1597,7 +1597,7 @@ This mode of write-behind operation is best used on the client side, to
enable decreased write latency for the application.
The write-behind translator can also aggregate write requests. If the
-@command{aggregate-size} option is specified, then successive writes upto that
+@command{aggregate-size} option is specified, then successive writes up to that
size are accumulated and written in a single operation. This mode of operation
is best used on the server side, as this will decrease the disk's head movement
when multiple files are being written to in parallel.
@@ -1655,7 +1655,7 @@ useful in a web hosting environment, where most clients will simply
read some files and only a few will write to them).
The IO cache translator reads data from its child in @command{page-size} chunks.
-It caches data upto @command{cache-size} bytes. The cache is maintained as
+It caches data up to @command{cache-size} bytes. The cache is maintained as
a prioritized least-recently-used (@acronym{LRU}) list, with priorities determined
by user-specified patterns to match filenames.
diff --git a/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh b/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
index d5658e3c865..0801386549a 100755
--- a/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
+++ b/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
@@ -5,7 +5,7 @@
## The scripts
## I. add-brick/pre/S28Quota-root-xattr-heal.sh (itself)
## II. add-brick/post/disabled-root-xattr-heal.sh AND
-## collectively acheives the job of healing the 'limit-set' xattr upon
+## collectively archieves the job of healing the 'limit-set' xattr upon
## add-brick to the gluster volume.
##
## This script is the 'controlling' script. Upon add-brick this script enables
generated by cgit (git 2.34.1) at 2024-11-11 16:59:37 +0000